diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-10 09:57:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 09:57:43 +0000 |
commit | 705c6b4d800207b39f1a69f2afa7fbb0ce1922ef (patch) | |
tree | 45a55c6feddd970fd86d4264c8451cfb411f38c6 | |
parent | 8b9763432ff308d7ea592ed5ec8cf79f14b10d95 (diff) | |
parent | 518c9baa3b54df29d27ab01457e9f1dfa7b8e867 (diff) | |
download | sample-705c6b4d800207b39f1a69f2afa7fbb0ce1922ef.tar.gz |
Merge "Convert Android.mk of LeanbackCustomizer to Android.bp" into main am: d36d55f7a8 am: 4b6d8b94e8 am: 518c9baa3b
Original change: https://android-review.googlesource.com/c/device/sample/+/2824751
Change-Id: I8e8d74247b0960a2adbf9df71fd1c6e64f2d81cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | apps/tv/LeanbackCustomizer/Android.bp | 28 | ||||
-rw-r--r-- | apps/tv/LeanbackCustomizer/Android.mk | 15 |
2 files changed, 28 insertions, 15 deletions
diff --git a/apps/tv/LeanbackCustomizer/Android.bp b/apps/tv/LeanbackCustomizer/Android.bp new file mode 100644 index 0000000..7b9eacd --- /dev/null +++ b/apps/tv/LeanbackCustomizer/Android.bp @@ -0,0 +1,28 @@ +// +// Copyright (C) 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +android_app { + name: "LeanbackCustomizer", + privileged: true, + srcs: ["src/**/*.java"], + sdk_version: "current", +} diff --git a/apps/tv/LeanbackCustomizer/Android.mk b/apps/tv/LeanbackCustomizer/Android.mk deleted file mode 100644 index 54db7c3..0000000 --- a/apps/tv/LeanbackCustomizer/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/priv-app - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := LeanbackCustomizer -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) |