release-request-53526352-7b51-4ab1-a661-632ffc55dd7c-for-git_oc-mr1-release-4371241 snap-temp-L10900000107789672android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I011817df8746d646f071dfe859f954aa5d451886

5 files changed, 8 insertions, 8 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index fdc9d4f..eae3b59 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,7 +15,7 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/aosp_car_emu_arm64.mk \
-    $(LOCAL_DIR)/aosp_car_emu_arm.mk \
-    $(LOCAL_DIR)/aosp_car_emu_x86.mk \
-    $(LOCAL_DIR)/aosp_car_emu_x86_64.mk \
+    $(LOCAL_DIR)/aosp_car_arm64.mk \
+    $(LOCAL_DIR)/aosp_car_arm.mk \
+    $(LOCAL_DIR)/aosp_car_x86.mk \
+    $(LOCAL_DIR)/aosp_car_x86_64.mk \
diff --git a/aosp_car_emu_arm.mk b/aosp_car_arm.mk
index b7ba7bb..e97eb50 100644
--- a/aosp_car_emu_arm.mk
+++ b/aosp_car_arm.mk
@@ -16,7 +16,7 @@
 $(call inherit-product, device/generic/car/common/car.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
 
-PRODUCT_NAME := aosp_car_emu_arm
+PRODUCT_NAME := aosp_car_arm
 PRODUCT_DEVICE := generic
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Car on arm64 emulator
diff --git a/aosp_car_emu_arm64.mk b/aosp_car_arm64.mk
index 5b5a54a..c550ac8 100644
--- a/aosp_car_emu_arm64.mk
+++ b/aosp_car_arm64.mk
@@ -16,7 +16,7 @@
 $(call inherit-product, device/generic/car/common/car.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
 
-PRODUCT_NAME := aosp_car_emu_arm64
+PRODUCT_NAME := aosp_car_arm64
 PRODUCT_DEVICE := generic_arm64
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Car on ARM emulator
diff --git a/aosp_car_emu_x86.mk b/aosp_car_x86.mk
index 94c4f87..69f2844 100644
--- a/aosp_car_emu_x86.mk
+++ b/aosp_car_x86.mk
@@ -16,7 +16,7 @@
 $(call inherit-product, device/generic/car/common/car.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
 
-PRODUCT_NAME := aosp_car_emu_x86
+PRODUCT_NAME := aosp_car_x86
 PRODUCT_DEVICE := generic_x86
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Car on x86 emulator
diff --git a/aosp_car_emu_x86_64.mk b/aosp_car_x86_64.mk
index 2c9d6d5..8712482 100644
--- a/aosp_car_emu_x86_64.mk
+++ b/aosp_car_x86_64.mk
@@ -16,7 +16,7 @@
 $(call inherit-product, device/generic/car/common/car.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
 
-PRODUCT_NAME := aosp_car_emu_x86_64
+PRODUCT_NAME := aosp_car_x86_64
 PRODUCT_DEVICE := generic_x86_64
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Car on x86_64 emulator