Snap for 11084970 from b3124838c1c13e5f9e3648b58698b669d977f2dc to 24Q1-release

Change-Id: I611a8b0012ed6f68e95c8605d26920f90f3a8113

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)