From 8bac501d4595f4aa994a2ea53bfdbb0f318705db Mon Sep 17 00:00:00 2001
From: Szu-An Lu <szuanlu@google.com>
Date: Wed, 21 Feb 2024 08:59:55 +0000
Subject: Revert "Use RRO for product-specific resources"

Revert submission 26265272-packageinstaller_product_characteristics_rro

Reason for revert: build breakage b/326147946

Reverted changes: /q/submissionid:26265272-packageinstaller_product_characteristics_rro

Change-Id: I4c4baad8be2658a98f3646701eb99fb590567f90
---
 packages/PackageInstaller/Android.bp | 66 +++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/packages/PackageInstaller/Android.bp b/packages/PackageInstaller/Android.bp
index b646da44f0aa..98a5a674fcdd 100644
--- a/packages/PackageInstaller/Android.bp
+++ b/packages/PackageInstaller/Android.bp
@@ -59,5 +59,69 @@ android_app {
     lint: {
         error_checks: ["Recycle"],
     },
-    generate_product_characteristics_rro: true,
+}
+
+android_app {
+    name: "PackageInstaller_tablet",
+    defaults: ["platform_app_defaults"],
+
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
+
+    certificate: "platform",
+    privileged: true,
+    platform_apis: false,
+    sdk_version: "system_current",
+    rename_resources_package: false,
+    overrides: ["PackageInstaller"],
+
+    static_libs: [
+        "xz-java",
+        "androidx.leanback_leanback",
+        "androidx.fragment_fragment",
+        "androidx.lifecycle_lifecycle-livedata",
+        "androidx.lifecycle_lifecycle-extensions",
+        "android.content.pm.flags-aconfig-java",
+        "android.os.flags-aconfig-java",
+    ],
+    aaptflags: ["--product tablet"],
+
+    lint: {
+        error_checks: ["Recycle"],
+    },
+}
+
+android_app {
+    name: "PackageInstaller_tv",
+    defaults: ["platform_app_defaults"],
+
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
+
+    certificate: "platform",
+    privileged: true,
+    platform_apis: false,
+    sdk_version: "system_current",
+    rename_resources_package: false,
+    overrides: ["PackageInstaller"],
+
+    static_libs: [
+        "xz-java",
+        "androidx.leanback_leanback",
+        "androidx.annotation_annotation",
+        "androidx.fragment_fragment",
+        "androidx.lifecycle_lifecycle-livedata",
+        "androidx.lifecycle_lifecycle-extensions",
+        "android.content.pm.flags-aconfig-java",
+        "android.os.flags-aconfig-java",
+    ],
+    aaptflags: ["--product tv"],
+
+    lint: {
+        error_checks: ["Recycle"],
+    },
 }
-- 
cgit v1.2.3-59-g8ed1b