diff options
author | Yuntao Xu <yuntaoxu@google.com> | 2021-05-10 21:46:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-10 21:46:21 +0000 |
commit | 0c6bc3c6f3884fe45b748c6604aa5a489ecd9397 (patch) | |
tree | 0f7f1db0ccb17c9cae5cf514ee2c892d98980222 | |
parent | 3c69d251f11d8f15349b44ccdda4a51769f656aa (diff) | |
parent | 2b1e4b4f3a1167a8cebe65282549f6c71a9eed6c (diff) | |
download | TV-android12-qpr3-s5-release.tar.gz |
Merge "Convert Android.mk to Android.bp" am: 1ea232f323 am: 2a2569c91f am: 2b1e4b4f3aandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1689287
Change-Id: I68ba36ffa35e17ceb61a33cca1ac033e344a6b97
-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) |