diff options
author | Yuntao Xu <yuntaoxu@google.com> | 2021-05-10 21:27:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-10 21:27:28 +0000 |
commit | 2b1e4b4f3a1167a8cebe65282549f6c71a9eed6c (patch) | |
tree | 367614cf8c01942a76e2f466cd6a3fdbb89011b8 | |
parent | a6918b86f1ed2a28e083dd040205c0e5ab5000b1 (diff) | |
parent | 2a2569c91f723dbf9dba77ede07700b8acf2ff7c (diff) | |
download | TV-2b1e4b4f3a1167a8cebe65282549f6c71a9eed6c.tar.gz |
Merge "Convert Android.mk to Android.bp" am: 1ea232f323 am: 2a2569c91f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1689287
Change-Id: I93a4559471fa968187ca77c0961e95bfdde1c18a
-rw-r--r-- | partner_support/sample_customization/Android.bp | 16 | ||||
-rw-r--r-- | partner_support/sample_customization/Android.mk | 20 |
2 files changed, 16 insertions, 20 deletions
diff --git a/partner_support/sample_customization/Android.bp b/partner_support/sample_customization/Android.bp new file mode 100644 index 00000000..f428f402 --- /dev/null +++ b/partner_support/sample_customization/Android.bp @@ -0,0 +1,16 @@ +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +android_app { + name: "PartnerSupportSampleCustomization", + optimize: { + enabled: false, + }, + // Overlay view related functionality requires system APIs. + sdk_version: "system_current", + min_sdk_version: "23", + // Required for customization + privileged: true, +} diff --git a/partner_support/sample_customization/Android.mk b/partner_support/sample_customization/Android.mk deleted file mode 100644 index e74a9268..00000000 --- a/partner_support/sample_customization/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := PartnerSupportSampleCustomization -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_MODULE_TAGS := optional - -LOCAL_PROGUARD_ENABLED := disabled -# Overlay view related functionality requires system APIs. -LOCAL_SDK_VERSION := system_current -LOCAL_MIN_SDK_VERSION := 23 # M - -# Required for customization -LOCAL_PRIVILEGED_MODULE := true - -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res - -include $(BUILD_PACKAGE) |