Skip to content

Commit 4577437

Browse files
committed
fix: preserve overlay.yaml during make clean, regenerate specs
make clean was deleting the entire specs/ directory, which wiped out hand-written overlay.yaml files (e.g. servicemanager/overlay.yaml). This caused check-generated to fail because overlay service constants (BatteryPropertiesService, MediaCameraService, etc.) disappeared. Fix: clean now deletes only spec.yaml files and empty directories, preserving overlay.yaml files. Also regenerates all specs with the generated-code header.
1 parent 11bece1 commit 4577437

383 files changed

Lines changed: 770 additions & 2 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ check-generated:
103103
make readme
104104
git diff --exit-code
105105

106-
# Remove all generated code and specs.
106+
# Remove all generated code and specs (preserving hand-written overlay.yaml files).
107107
clean:
108-
rm -rf $(GENERATED_DIRS) specs
108+
rm -rf $(GENERATED_DIRS)
109+
find specs -name spec.yaml -delete 2>/dev/null; find specs -type d -empty -delete 2>/dev/null; true
109110
find . -maxdepth 1 -name '*.go' -exec grep -l 'Code generated' {} \; | xargs -r rm -f
110111
rm -f servicemanager/service_names_gen.go

cmd/bindercli/commands_gen.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,10 +1807,13 @@ var knownServiceNames = map[string]string{
18071807
"android.content.om.IOverlayManager": "overlay",
18081808
"android.content.pm.ICrossProfileApps": "crossprofileapps",
18091809
"android.content.pm.IDataLoaderManager": "dataloader_manager",
1810+
"android.content.pm.IPackageManager": "package",
1811+
"android.content.pm.IPackageManagerNative": "package_native",
18101812
"android.content.pm.IShortcutService": "shortcut",
18111813
"android.content.pm.verify.domain.IDomainVerificationManager": "domain_verification",
18121814
"android.credentials.ICredentialManager": "credential",
18131815
"android.debug.IAdbManager": "adb",
1816+
"android.hardware.ICameraService": "media.camera",
18141817
"android.hardware.ISerialManager": "serial",
18151818
"android.hardware.biometrics.IAuthService": "biometric",
18161819
"android.hardware.face.IFaceService": "face",
@@ -1831,6 +1834,7 @@ var knownServiceNames = map[string]string{
18311834
"android.net.IPacProxyManager": "pac_proxy",
18321835
"android.net.IVpnManager": "vpn_management",
18331836
"android.net.vcn.IVcnManagementService": "vcn_management",
1837+
"android.os.IBatteryPropertiesRegistrar": "batteryproperties",
18341838
"android.os.IDumpstate": "bugreport",
18351839
"android.os.IHardwarePropertiesManager": "hardware_properties",
18361840
"android.os.IPowerManager": "power",
@@ -1840,6 +1844,7 @@ var knownServiceNames = map[string]string{
18401844
"android.os.IUserManager": "user",
18411845
"android.os.image.IDynamicSystemService": "dynamic_system",
18421846
"android.os.incremental.IIncrementalService": "incremental",
1847+
"android.os.storage.IStorageManager": "mount",
18431848
"android.print.IPrintManager": "print",
18441849
"android.security.IFileIntegrityService": "file_integrity",
18451850
"android.security.attestationverification.IAttestationVerificationManagerService": "attestation_verification",

specs/aaudio/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: aaudio
24
go_package: aaudio
35
interfaces:

specs/android/accessibilityservice/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: android.accessibilityservice
24
go_package: android/accessibilityservice
35
interfaces:

specs/android/accounts/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: android.accounts
24
go_package: android/accounts
35
interfaces:

specs/android/app/admin/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: android.app.admin
24
go_package: android/app/admin
35
interfaces:

specs/android/app/ambientcontext/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: android.app.ambientcontext
24
go_package: android/app/ambientcontext
35
interfaces:

specs/android/app/assist/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: android.app.assist
24
go_package: android/app/assist
35
parcelables:

specs/android/app/backup/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: android.app.backup
24
go_package: android/app/backup
35
interfaces:

specs/android/app/blob/spec.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Code generated by aidl2spec/java2spec. DO NOT EDIT.
2+
# To add custom entries, create an overlay.yaml in this directory.
13
package: android.app.blob
24
go_package: android/app/blob
35
interfaces:

0 commit comments

Comments
 (0)