summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYao Chen <yaochen@google.com>2017-02-03 10:26:24 -0800
committerYao Chen <yaochen@google.com>2017-02-03 10:26:24 -0800
commitdef408a8cf9c9d6d2a128e506cad9eb75bebbbb9 (patch)
treeea6b7417526bca5b531908ea4d5c231aa111465a
parent6c689d31429bcc79e2d0ac6c237327b6e108a22d (diff)
downloaddevice_generic_car-def408a8cf9c9d6d2a128e506cad9eb75bebbbb9.tar.gz
device_generic_car-def408a8cf9c9d6d2a128e506cad9eb75bebbbb9.tar.bz2
device_generic_car-def408a8cf9c9d6d2a128e506cad9eb75bebbbb9.zip
Shorten car_emulator build target name. Context: b/34873263
Test: build successfully Change-Id: Iea466e234c61551971f39ffbf49bff529698cf04
-rw-r--r--car-arm64/AndroidProducts.mk2
-rw-r--r--car-arm64/car_emu_arm64.mk (renamed from car-arm64/car_emulator_arm64.mk)2
-rw-r--r--car-arm64/vendorsetup.sh2
-rw-r--r--car-armv7-a-neon/AndroidProducts.mk2
-rw-r--r--car-armv7-a-neon/car_emu_arm.mk (renamed from car-armv7-a-neon/car_emulator_arm.mk)2
-rw-r--r--car-armv7-a-neon/vendorsetup.sh2
-rw-r--r--car-x86_64/AndroidProducts.mk2
-rw-r--r--car-x86_64/car_emu_x86_64.mk (renamed from car-x86_64/car_emulator_x86_64.mk)2
-rw-r--r--car-x86_64/vendorsetup.sh2
9 files changed, 9 insertions, 9 deletions
diff --git a/car-arm64/AndroidProducts.mk b/car-arm64/AndroidProducts.mk
index 7040888..a11b8bd 100644
--- a/car-arm64/AndroidProducts.mk
+++ b/car-arm64/AndroidProducts.mk
@@ -15,4 +15,4 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/car_emulator_arm64.mk
+ $(LOCAL_DIR)/car_emu_arm64.mk
diff --git a/car-arm64/car_emulator_arm64.mk b/car-arm64/car_emu_arm64.mk
index 586157b..363a1a1 100644
--- a/car-arm64/car_emulator_arm64.mk
+++ b/car-arm64/car_emu_arm64.mk
@@ -24,7 +24,7 @@ PRODUCT_PACKAGE_OVERLAYS := packages/services/Car/car_product/overlay
# Overrides
PRODUCT_BRAND := google
PRODUCT_MODEL := Car on ARM emulator
-PRODUCT_NAME := car_emulator_arm64
+PRODUCT_NAME := car_emu_arm64
PRODUCT_DEVICE := car-arm64
PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/car-arm64/vendorsetup.sh b/car-arm64/vendorsetup.sh
index b610cb2..63d6503 100644
--- a/car-arm64/vendorsetup.sh
+++ b/car-arm64/vendorsetup.sh
@@ -20,4 +20,4 @@
# In particular, you can add lunch options with the add_lunch_combo
# function: add_lunch_combo generic-eng
-add_lunch_combo car_emulator_arm64-userdebug
+add_lunch_combo car_emu_arm64-userdebug
diff --git a/car-armv7-a-neon/AndroidProducts.mk b/car-armv7-a-neon/AndroidProducts.mk
index 86f2ee9..5e8836a 100644
--- a/car-armv7-a-neon/AndroidProducts.mk
+++ b/car-armv7-a-neon/AndroidProducts.mk
@@ -15,4 +15,4 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/car_emulator_arm.mk
+ $(LOCAL_DIR)/car_emu_arm.mk
diff --git a/car-armv7-a-neon/car_emulator_arm.mk b/car-armv7-a-neon/car_emu_arm.mk
index 4ab11ee..7e83ddf 100644
--- a/car-armv7-a-neon/car_emulator_arm.mk
+++ b/car-armv7-a-neon/car_emu_arm.mk
@@ -24,7 +24,7 @@ PRODUCT_PACKAGE_OVERLAYS := packages/services/Car/car_product/overlay
# Overrides
PRODUCT_BRAND := google
PRODUCT_MODEL := Car on ARM emulator
-PRODUCT_NAME := car_emulator_arm
+PRODUCT_NAME := car_emu_arm
PRODUCT_DEVICE := car-armv7-a-neon
PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/car-armv7-a-neon/vendorsetup.sh b/car-armv7-a-neon/vendorsetup.sh
index eed5f78..89fd301 100644
--- a/car-armv7-a-neon/vendorsetup.sh
+++ b/car-armv7-a-neon/vendorsetup.sh
@@ -20,4 +20,4 @@
# In particular, you can add lunch options with the add_lunch_combo
# function: add_lunch_combo generic-eng
-add_lunch_combo car_emulator_arm-userdebug
+add_lunch_combo car_emu_arm-userdebug
diff --git a/car-x86_64/AndroidProducts.mk b/car-x86_64/AndroidProducts.mk
index df1b1d3..5e1957a 100644
--- a/car-x86_64/AndroidProducts.mk
+++ b/car-x86_64/AndroidProducts.mk
@@ -15,4 +15,4 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/car_emulator_x86_64.mk
+ $(LOCAL_DIR)/car_emu_x86_64.mk
diff --git a/car-x86_64/car_emulator_x86_64.mk b/car-x86_64/car_emu_x86_64.mk
index 89dc6d1..a3c6e65 100644
--- a/car-x86_64/car_emulator_x86_64.mk
+++ b/car-x86_64/car_emu_x86_64.mk
@@ -24,7 +24,7 @@ PRODUCT_PACKAGE_OVERLAYS := packages/services/Car/car_product/overlay
# Overrides
PRODUCT_BRAND := google
PRODUCT_MODEL := Car on x86 emulator
-PRODUCT_NAME := car_emulator_x86_64
+PRODUCT_NAME := car_emu_x86_64
PRODUCT_DEVICE := car-x86_64
PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/car-x86_64/vendorsetup.sh b/car-x86_64/vendorsetup.sh
index 17755ba..5f16636 100644
--- a/car-x86_64/vendorsetup.sh
+++ b/car-x86_64/vendorsetup.sh
@@ -20,4 +20,4 @@
# In particular, you can add lunch options with the add_lunch_combo
# function: add_lunch_combo generic-eng
-add_lunch_combo car_emulator_x86_64-userdebug
+add_lunch_combo car_emu_x86_64-userdebug