diff options
| author | Nikita Ioffe <ioffe@google.com> | 2019-10-07 15:10:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-07 15:10:10 +0000 |
| commit | 42b2b54c2b3961f7a25098e044e3c8261779e712 (patch) | |
| tree | 0e806743a92e976f4ea602c2d193051d2b2db00a | |
| parent | 8ca4bf76d682bfc87028c0acff24ca0388e87205 (diff) | |
| parent | b6eeae7289a1d7d0905c303d5bf5e9501e041189 (diff) | |
| download | build-42b2b54c2b3961f7a25098e044e3c8261779e712.tar.gz | |
Merge "Unconditionally install shim apex on system partition"
| -rw-r--r-- | target/product/base_system.mk | 1 | ||||
| -rw-r--r-- | target/product/mainline_system.mk | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index a8ed28ae8a..f49218acaf 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -48,6 +48,7 @@ PRODUCT_PACKAGES += \ cgroups.json \ charger \ cmd \ + com.android.apex.cts.shim.v1_prebuilt \ com.android.conscrypt \ com.android.i18n \ com.android.location.provider \ diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index 721f5d9865..b8f2838758 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -105,9 +105,6 @@ PRODUCT_HOST_PACKAGES += \ # Enable dynamic partition size PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true -PRODUCT_PACKAGES += \ - com.android.apex.cts.shim.v1_prebuilt - PRODUCT_ENFORCE_RRO_TARGETS := * PRODUCT_NAME := mainline_system |