diff options
author | Xin Li <delphij@google.com> | 2019-09-04 13:34:51 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2019-09-04 13:34:51 -0700 |
commit | 889541b8d90ce7f81fba7917049f01a82203b2bc (patch) | |
tree | db22aa44e192ae2ba85ba897457a0a751d718f19 | |
parent | 732a706905948982da8ae636b282db4c8ea9c3a9 (diff) | |
parent | 4f703ffaa81a545f797b1dfae5245292d9117836 (diff) | |
download | TimeZoneData-889541b8d90ce7f81fba7917049f01a82203b2bc.tar.gz |
DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21
Bug: 139893257
Change-Id: Id15a0e7908a1feee86bab8cedd06024518107dd5
-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 |