diff options
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | core/Makefile | 4 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 5 | ||||
| -rw-r--r-- | target/product/iorap_large_memory_config.mk | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 623dc39413..3fc7cbcf02 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -713,6 +713,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.h $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.cellbroadcast.apex) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.cellbroadcast) +# Remove CellBroadcastLegacyApp for Go devices +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CellBroadcastLegacyApp) + # Remove MediaProvider after moving into APEX $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/MediaProvider) diff --git a/core/Makefile b/core/Makefile index a36ea223f4..62ddef6319 100644 --- a/core/Makefile +++ b/core/Makefile @@ -721,7 +721,7 @@ DEPMOD_STAGING_SUBDIR :=$= lib/modules/0.0 define copy-and-strip-kernel-module $(2): $(1) - $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_STRIP) -o $(2) --strip-debug $(1) + $(LLVM_STRIP) -o $(2) --strip-debug $(1) endef # $(1): modules list @@ -1479,6 +1479,8 @@ license_modules := $(filter-out $(TARGET_OUT_FAKE)/%,$(license_modules)) # testcases are not relevant to the system image. license_modules := $(filter-out $(TARGET_OUT_TESTCASES)/%,$(license_modules)) license_modules_system := $(filter $(TARGET_OUT)/%,$(license_modules)) +# system_other is relevant to system partition. +license_modules_system += $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(license_modules)) license_modules_vendor := $(filter $(TARGET_OUT_VENDOR)/%,$(license_modules)) license_modules_product := $(filter $(TARGET_OUT_PRODUCT)/%,$(license_modules)) license_modules_system_ext := $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(license_modules)) diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index d786177fb1..d3521fc944 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -44,6 +44,11 @@ TARGET_FLATTEN_APEX := false # GSI targets should install "flattened" APEXes in /system_ext as well PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES := true +# The flattened version of com.android.apex.cts.shim.v1 should be explicitly installed +# because the shim apex is prebuilt one and PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not +# supported for prebuilt_apex modules yet. +PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened + # GSI specific tasks on boot PRODUCT_PACKAGES += \ gsi_skip_mount.cfg \ diff --git a/target/product/iorap_large_memory_config.mk b/target/product/iorap_large_memory_config.mk index ad97e4d342..9aa664214d 100644 --- a/target/product/iorap_large_memory_config.mk +++ b/target/product/iorap_large_memory_config.mk @@ -13,6 +13,6 @@ # limitations under the License. # -# Enable Camera pinner by default +# Disable Camera pinner by default PRODUCT_PRODUCT_PROPERTIES += \ - pinner.pin_camera=true + pinner.pin_camera=false |