Merge "bp2build data property -> data attr in gensrcs" am: 86c7300bf3 am: ce8670a392 am: 26b1878d8d am: 7df84dbe4e am: c2330d22d7 am: 5bdb5f32b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2621008
Change-Id: Ice8e42a5a3c38ccfde8a700b080de74a7bd0ea3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/config.go b/android/config.go
index 90dbe0b..e3d488f 100644
--- a/android/config.go
+++ b/android/config.go
@@ -640,9 +640,12 @@
"framework-adservices": {},
"framework-appsearch": {},
"framework-bluetooth": {},
+ "framework-configinfrastructure": {},
"framework-connectivity": {},
"framework-connectivity-t": {},
+ "framework-devicelock": {},
"framework-graphics": {},
+ "framework-healthfitness": {},
"framework-media": {},
"framework-mediaprovider": {},
"framework-ondevicepersonalization": {},
diff --git a/android/updatable_modules.go b/android/updatable_modules.go
index 6d0eeb7..1548170 100644
--- a/android/updatable_modules.go
+++ b/android/updatable_modules.go
@@ -33,4 +33,4 @@
// * AOSP - xx9990000
// * x-mainline-prod - xx9990000
// * master - 990090000
-const DefaultUpdatableModuleVersion = "340090000"
+const DefaultUpdatableModuleVersion = "990090000"