diff options
| author | Xin Li <delphij@google.com> | 2019-07-01 21:00:08 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-07-01 21:00:08 +0000 |
| commit | 4f703ffaa81a545f797b1dfae5245292d9117836 (patch) | |
| tree | db22aa44e192ae2ba85ba897457a0a751d718f19 | |
| parent | 732a706905948982da8ae636b282db4c8ea9c3a9 (diff) | |
| parent | 52bff87fa8f9413d81d8af0d258fa4ea209f84ec (diff) | |
| download | TimeZoneData-4f703ffaa81a545f797b1dfae5245292d9117836.tar.gz | |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-mastertemp_140451723
Bug: 134405016
Change-Id: Ia54690598ef73f30d106d15817719e6769688b2c
| -rw-r--r-- | oem_template/data_app/build_oem_data_app.mk | 7 | ||||
| -rw-r--r-- | oem_template/data_app_prebuilt/include_app_prebuilt.mk | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/oem_template/data_app/build_oem_data_app.mk b/oem_template/data_app/build_oem_data_app.mk index f31e5d1..0c45ff1 100644 --- a/oem_template/data_app/build_oem_data_app.mk +++ b/oem_template/data_app/build_oem_data_app.mk @@ -44,7 +44,12 @@ LOCAL_AAPT_FLAGS := --version-code $(TIME_ZONE_DATA_APP_VERSION_CODE) \ # OEM-INSTRUCTION: Modify the name, s/oemcorp/<Your company name>/ LOCAL_MODULE_OWNER := oemcorp -LOCAL_PRIVILEGED_MODULE := true + +# The app build is expected to generate a prebuilt, so do not place the app in +# the system image. +LOCAL_UNINSTALLABLE_MODULE := true + +LOCAL_PRODUCT_MODULE := true # OEM-INSTRUCTION: Configure your own certificate. LOCAL_CERTIFICATE := diff --git a/oem_template/data_app_prebuilt/include_app_prebuilt.mk b/oem_template/data_app_prebuilt/include_app_prebuilt.mk index f4c6be9..3ebc464 100644 --- a/oem_template/data_app_prebuilt/include_app_prebuilt.mk +++ b/oem_template/data_app_prebuilt/include_app_prebuilt.mk @@ -29,6 +29,7 @@ LOCAL_MODULE_TAGS := optional # OEM-INSTRUCTION: Change this LOCAL_MODULE_OWNER := oemcorp LOCAL_PRIVILEGED_MODULE := true +LOCAL_PRODUCT_MODULE := true LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE_CLASS := APPS |