Snap for 8534619 from 88e39796629d8ffaa493e9fc0ca9fd7ea1633331 to tm-release

Change-Id: I8c5e4f1344da2ade64f049c13d1f7aff35d85f46

6 files changed, 26 insertions, 29 deletions

diff --git a/emulator/usbpt/bluetooth/btusb/btusb.mk b/emulator/usbpt/bluetooth/btusb/btusb.mk
index 6e21465..d2c52c2 100644
--- a/emulator/usbpt/bluetooth/btusb/btusb.mk
+++ b/emulator/usbpt/bluetooth/btusb/btusb.mk
@@ -19,9 +19,5 @@ BOARD_SEPOLICY_DIRS += \
     device/generic/car/emulator/usbpt/bluetooth/btusb/sepolicy
 endif
 
-# USB Passthru
-PRODUCT_PACKAGES += rtl8821c_fw.bin.car \
-                    rtl8821c_config.bin.car
-
 PRODUCT_COPY_FILES += \
     device/generic/car/emulator/usbpt/bluetooth/btusb/init.btusb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.btusb.rc \
diff --git a/emulator/usbpt/bluetooth/btusb/rtl_bt/Android.bp b/emulator/usbpt/bluetooth/btusb/rtl_bt/Android.bp
deleted file mode 100644
index ade064e..0000000
--- a/emulator/usbpt/bluetooth/btusb/rtl_bt/Android.bp
+++ /dev/null
@@ -1,24 +0,0 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_generic_car_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["device_generic_car_license"],
-}
-
-prebuilt_firmware {
-    name: "rtl8821c_fw.bin.car",
-    src: "rtl8821c_fw.bin",
-    sub_dir: "rtl_bt",
-    filename_from_src: true,
-    proprietary: true,
-}
-
-prebuilt_firmware {
-    name: "rtl8821c_config.bin.car",
-    src: "rtl8821c_config.bin",
-    sub_dir: "rtl_bt",
-    filename_from_src: true,
-    proprietary: true,
-}
diff --git a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_config.bin b/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_config.bin
deleted file mode 100755
index 76f62b8..0000000
--- a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_config.bin
+++ /dev/null
diff --git a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_fw.bin b/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_fw.bin
deleted file mode 100644
index ad31c94..0000000
--- a/emulator/usbpt/bluetooth/btusb/rtl_bt/rtl8821c_fw.bin
+++ /dev/null
diff --git a/emulator_car64_x86_64/BoardConfig.mk b/emulator_car64_x86_64/BoardConfig.mk
new file mode 100644
index 0000000..bfd00ce
--- /dev/null
+++ b/emulator_car64_x86_64/BoardConfig.mk
@@ -0,0 +1,24 @@
+# Copyright (C) 2022 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.
+#
+
+# Use emulator64_x86_64_arm64 BoardConfig as base
+include device/generic/goldfish/emulator64_x86_64/BoardConfig.mk
+include device/generic/car/emulator/usbpt/BoardConfig.mk
+
+# Override BOARD_SUPER_PARTITION_SIZE to inclease the mounted system partition.
+BOARD_SUPER_PARTITION_SIZE := 5856296960
+
+BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE = 3489660928
+
diff --git a/gsi_car_base.mk b/gsi_car_base.mk
index 6f76d44..79f08f4 100644
--- a/gsi_car_base.mk
+++ b/gsi_car_base.mk
@@ -31,8 +31,9 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     system/app/CarLatinIME/CarLatinIME.apk \
     system/app/CarMapsPlaceholder/CarMapsPlaceholder.apk \
     system/app/CarPermissionControllerRRO/CarPermissionControllerRRO.apk \
-    system/app/RotaryIME/RotaryIME.apk \
     system/app/CarRotaryImeRRO/CarRotaryImeRRO.apk \
+    system/app/HideCameraApps/HideCameraApps.apk \
+    system/app/RotaryIME/RotaryIME.apk \
     system/app/RotaryPlayground/RotaryPlayground.apk \
     system/app/SampleCustomInputService/SampleCustomInputService.apk \
     system/app/SampleRearViewCamera/SampleRearViewCamera.apk \