release-request-93b39faf-58a9-4461-bb2b-3838af644683-for-git_oc-dr1-release-4034217 snap-temp-L12900000066789025android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: I3add5ac23674446ea921bc3e34ff4b0f40375d62

4 files changed, 53 insertions, 34 deletions

diff --git a/car-x86/AndroidProducts.mk b/car-x86/AndroidProducts.mk
index 8113bfa..d504ea8 100644
--- a/car-x86/AndroidProducts.mk
+++ b/car-x86/AndroidProducts.mk
@@ -15,4 +15,5 @@
 #
 
 PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/aosp_car_emu_x86.mk \
     $(LOCAL_DIR)/car_emu_x86.mk
diff --git a/car-x86/aosp_car_emu_x86.mk b/car-x86/aosp_car_emu_x86.mk
new file mode 100644
index 0000000..37b4f0e
--- /dev/null
+++ b/car-x86/aosp_car_emu_x86.mk
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2017 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.
+
+PRODUCT_COPY_FILES += \
+    device/generic/car/common/bootanimations/bootanimation-832.zip:system/media/bootanimation.zip \
+    device/generic/car/common/init.car-emulator.rc:root/init.goldfish.rc
+
+$(call inherit-product, device/generic/car/common/product/aosp_x86.mk)
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+PRODUCT_PACKAGE_OVERLAYS := packages/services/Car/car_product/overlay
+
+# Overrides
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Car on x86 emulator
+PRODUCT_NAME := aosp_car_emu_x86
+PRODUCT_DEVICE := car-x86
+
+PRODUCT_RESTRICT_VENDOR_FILES := false
+
+PRODUCT_PACKAGES += \
+   vehicle.default
+# Replace framework versions with dummy one, which is essentially
+# the same as removing the xml. Needs this as there is no easy
+# way to remove PRODUCT_COPY_FILES from inherited products.
+PRODUCT_COPY_FILES += \
+    device/generic/car/common/android.hardware.dummy.xml:system/etc/permissions/handheld_core_hardware.xml \
+    packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \
+    packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml \
+    frameworks/native/data/etc/android.hardware.screen.landscape.xml:system/etc/permissions/android.hardware.screen.landscape.xml
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    android.car.drawer.unlimited=true \
+    android.car.hvac.demo=true \
+    com.android.car.radio.demo=true \
+    com.android.car.radio.demo.dual=true
diff --git a/car-x86/car_emu_x86.mk b/car-x86/car_emu_x86.mk
index e396b2e..0289a4e 100644
--- a/car-x86/car_emu_x86.mk
+++ b/car-x86/car_emu_x86.mk
@@ -13,38 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PRODUCT_COPY_FILES += \
-    device/generic/car/common/bootanimations/bootanimation-832.zip:system/media/bootanimation.zip \
-    device/generic/car/common/init.car-emulator.rc:root/init.goldfish.rc
-
-$(call inherit-product, device/generic/car/common/product/aosp_x86.mk)
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
-PRODUCT_PACKAGE_OVERLAYS := packages/services/Car/car_product/overlay
-
-# Overrides
-PRODUCT_BRAND := google
-PRODUCT_MODEL := Car on x86 emulator
+$(call inherit-product, device/generic/car/car-x86/aosp_car_emu_x86.mk)
 PRODUCT_NAME := car_emu_x86
-PRODUCT_DEVICE := car-x86
-
-PRODUCT_RESTRICT_VENDOR_FILES := false
-
-PRODUCT_PACKAGES += \
-   vehicle.default
-# Replace framework versions with dummy one, which is essentially
-# the same as removing the xml. Needs this as there is no easy
-# way to remove PRODUCT_COPY_FILES from inherited products.
-PRODUCT_COPY_FILES += \
-    device/generic/car/common/android.hardware.dummy.xml:system/etc/permissions/handheld_core_hardware.xml \
-    packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \
-    packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml \
-    frameworks/native/data/etc/android.hardware.screen.landscape.xml:system/etc/permissions/android.hardware.screen.landscape.xml
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    android.car.drawer.unlimited=true \
-    android.car.hvac.demo=true \
-    com.android.car.radio.demo=true \
-    com.android.car.radio.demo.dual=true
diff --git a/car-x86/vendorsetup.sh b/car-x86/vendorsetup.sh
index e838bec..5ad8293 100644
--- a/car-x86/vendorsetup.sh
+++ b/car-x86/vendorsetup.sh
@@ -20,4 +20,5 @@
 # In particular, you can add lunch options with the add_lunch_combo
 # function: add_lunch_combo generic-eng
 
+add_lunch_combo aosp_car_emu_x86-userdebug
 add_lunch_combo car_emu_x86-userdebug