release-request-53526352-7b51-4ab1-a661-632ffc55dd7c-for-git_oc-mr1-release-4371241 snap-temp-L10900000107789672
Change-Id: I011817df8746d646f071dfe859f954aa5d451886
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
similarity index 95%
rename from aosp_car_emu_arm.mk
rename to 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
similarity index 95%
rename from aosp_car_emu_arm64.mk
rename to 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
similarity index 95%
rename from aosp_car_emu_x86.mk
rename to 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
similarity index 95%
rename from aosp_car_emu_x86_64.mk
rename to 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
