summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2017-07-18 06:00:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-18 06:00:51 +0000
commitf4c2abcd61dc5c805b536a1eb79720576054598a (patch)
tree1faef377d9dfdb0c68c7454946fe041d3f8af8f2
parente27548d774ec6b6d46c3c30e8e6390bf43d5e802 (diff)
parentf857be8034c14600ca562f927aabcdedcced8192 (diff)
downloadTimeZoneData-f4c2abcd61dc5c805b536a1eb79720576054598a.tar.gz
Add specification of min-sdk-version during build am: 8ece8967cc am: 6e5611189a am: 2bed1ebc4d
am: f857be8034 Change-Id: Ia077dc2fc0755a46c4602228f95e675658a134de
-rw-r--r--oem_template/data_app/build_oem_data_app.mk3
-rw-r--r--oem_template/data_app/testing/Android.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/oem_template/data_app/build_oem_data_app.mk b/oem_template/data_app/build_oem_data_app.mk
index e82867d..7d9e611 100644
--- a/oem_template/data_app/build_oem_data_app.mk
+++ b/oem_template/data_app/build_oem_data_app.mk
@@ -37,7 +37,8 @@ LOCAL_FULL_MANIFEST_FILE := packages/apps/TimeZoneData/manifests/install/Android
LOCAL_PACKAGE_NAME := TimeZoneData$(TIME_ZONE_DATA_APP_SUFFIX)
LOCAL_AAPT_FLAGS := --version-code $(TIME_ZONE_DATA_APP_VERSION_CODE) \
- --version-name $(TIME_ZONE_DATA_APP_VERSION_NAME)
+ --version-name $(TIME_ZONE_DATA_APP_VERSION_NAME) \
+ --min-sdk-version $(PLATFORM_SDK_VERSION)
# OEM-INSTRUCTION: Modify the name, s/oemcorp/<Your company name>/
LOCAL_AAPT_FLAGS += --rename-manifest-package com.oemcorp.android.timezone.data
diff --git a/oem_template/data_app/testing/Android.mk b/oem_template/data_app/testing/Android.mk
index 11be369..8c2bb7a 100644
--- a/oem_template/data_app/testing/Android.mk
+++ b/oem_template/data_app/testing/Android.mk
@@ -52,4 +52,4 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
include $(LOCAL_PATH)/build_oem_test_data_app.mk
# Tidy up variables.
-aosp_test_data_path := \ No newline at end of file
+aosp_test_data_path :=