aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-11-13 06:21:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 06:21:15 +0000
commitddb5f0483a2c2ba124a718332e80404302cae3f4 (patch)
tree557ab3223c7b9ca8de4f7386f8dbf2b987fa1a42
parenta5ac6676fccf3cd9b8520e8896686a83e0e74631 (diff)
parent1c9c98ca7db4c6565821c6ced2e8e4ade6a0ba2b (diff)
downloadsample-ddb5f0483a2c2ba124a718332e80404302cae3f4.tar.gz
Merge "Convert Android.mk of LeanbackWidget to Android.bp" into main am: 1c9c98ca7d
Original change: https://android-review.googlesource.com/c/device/sample/+/2825910 Change-Id: Id5f0228e669ff78301f1e5480c29b6897ef89619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--apps/tv/LeanbackWidget/Android.bp28
-rw-r--r--apps/tv/LeanbackWidget/Android.mk15
2 files changed, 28 insertions, 15 deletions
diff --git a/apps/tv/LeanbackWidget/Android.bp b/apps/tv/LeanbackWidget/Android.bp
new file mode 100644
index 0000000..0d6973a
--- /dev/null
+++ b/apps/tv/LeanbackWidget/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: "LeanbackWidget",
+ srcs: ["src/**/*.java"],
+ sdk_version: "current",
+}
diff --git a/apps/tv/LeanbackWidget/Android.mk b/apps/tv/LeanbackWidget/Android.mk
deleted file mode 100644
index 1fe0dea..0000000
--- a/apps/tv/LeanbackWidget/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/app
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := LeanbackWidget
-LOCAL_LICENSE_KINDS := legacy_notice
-LOCAL_LICENSE_CONDITIONS := notice
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)