diff options
| author | Nick Chalko <nchalko@google.com> | 2019-05-14 14:54:39 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2019-05-15 16:01:44 -0700 |
| commit | 95831cf1c01d3a012a4a312636d01ebfb7fed625 (patch) | |
| tree | d24ffc7f25fcef6bbf15b8d54df4f0ef469e42ca /partner_support | |
| parent | bebfebaaf4d82a2907c2bc87c55b2fbd6cdf449d (diff) | |
| download | TV-95831cf1c01d3a012a4a312636d01ebfb7fed625.tar.gz | |
Fix the master build adding androidx and other deps
Change-Id: Id9923476a5bfd85c9e6fe831954612888d368905
Test: m LiveTv
Diffstat (limited to 'partner_support')
| -rw-r--r-- | partner_support/samples/Android.bp | 25 | ||||
| -rw-r--r-- | partner_support/samples/Android.mk | 33 |
2 files changed, 25 insertions, 33 deletions
diff --git a/partner_support/samples/Android.bp b/partner_support/samples/Android.bp new file mode 100644 index 00000000..9c1d2db8 --- /dev/null +++ b/partner_support/samples/Android.bp @@ -0,0 +1,25 @@ +android_app { + name: "PartnerSupportSampleTvInput", + + // Include all java files. + srcs: ["src/**/*.java"], + + static_libs: [ + "androidx.leanback_leanback", + "androidx.tvprovider_tvprovider", + "live-channels-partner-support", + ], + + optimize: { + enabled: false, + }, + // Overlay view related functionality requires system APIs. + sdk_version: "system_current", + min_sdk_version: "23", // M + + // Required for com.android.tv.permission.RECEIVE_INPUT_EVENT + privileged: true, + + resource_dirs: ["res"], + +} diff --git a/partner_support/samples/Android.mk b/partner_support/samples/Android.mk deleted file mode 100644 index 2e771a5b..00000000 --- a/partner_support/samples/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# Include all java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := PartnerSupportSampleTvInput -LOCAL_MODULE_TAGS := optional - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-annotations \ - live-channels-partner-support - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-compat \ - android-support-core-ui \ - android-support-v7-recyclerview \ - android-support-v17-leanback \ - androidx.tvprovider_tvprovider - -LOCAL_USE_AAPT2 := true - -LOCAL_PROGUARD_ENABLED := disabled -# Overlay view related functionality requires system APIs. -LOCAL_SDK_VERSION := system_current -LOCAL_MIN_SDK_VERSION := 23 # M - -# Required for com.android.tv.permission.RECEIVE_INPUT_EVENT -LOCAL_PRIVILEGED_MODULE := true - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -include $(BUILD_PACKAGE) |