resolve merge conflicts of 0a81687a251b34a75133e882dc4de9723eaefb87 to qt-r1-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iee31e0df5e5d2b94c9ba7d6815fbbb41497c33c6
diff --git a/CleanSpec.mk b/CleanSpec.mk
index ec031d1..dff1037f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -646,6 +646,10 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)
+# Remove libcameraservice and libcamera_client from base_system
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so)
+
# Move product and system_ext to root for emulators
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/product)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/system_ext)
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 49df60b..5dbc9ec 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -128,8 +128,6 @@
libbinder_ndk \
libc.bootstrap \
libcamera2ndk \
- libcamera_client \
- libcameraservice \
libcutils \
libdl.bootstrap \
libdrmframework \
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 3119afa..080f289 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -1004,6 +1004,10 @@
codename = codename.strip()
if codename:
result[codename] = api_level
+
+ # Work around APKs that still target 'Q' instead of API 29 (b/132882632).
+ result['Q'] = 29
+
return result