Relaunch "Create CarHTMLViewer for car builds"android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev

ag/14276507 got reverted because of a build error. The build error
was fixed by allowing CarHTMLViewer to be in /system partition.

Bug: 185951366
Test: lunch gsi_car_arm64 && make CarHTMLViewer
Test: manual test
Change-Id: I2c4729ab6352a6b06bdb9969c17ff3ee64ea3331

1 files changed, 12 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 679d50a..c85f4fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,18 @@ license {
 
 android_app {
     name: "HTMLViewer",
+    manifest: "AndroidManifest.xml",
     srcs: ["**/*.java"],
+    exclude_srcs: ["src/com/android/htmlviewer/CarHTMLViewerActivity.java"],
+    sdk_version: "current",
+}
+
+android_app {
+    name: "CarHTMLViewer",
+    manifest: "AndroidManifest-car.xml",
+    overrides: ["HTMLViewer"],
+    srcs: ["**/*.java"],
+    libs: ["android.car-stubs"],
+    static_libs: ["car-ui-lib"],
     sdk_version: "current",
 }