Merge cherrypicks of [9732741, 9732578] into qt-qpr1-release
Change-Id: Ia3ed40c06076178caa755f632aa53cf436583e47
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 50c5cad..0270f3c 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,9 +19,11 @@
$(LOCAL_DIR)/aosp_car_arm.mk \
$(LOCAL_DIR)/aosp_car_x86.mk \
$(LOCAL_DIR)/aosp_car_x86_64.mk \
+ $(LOCAL_DIR)/car_x86_64.mk \
COMMON_LUNCH_CHOICES := \
aosp_car_arm-userdebug \
aosp_car_arm64-userdebug \
aosp_car_x86-userdebug \
- aosp_car_x86_64-userdebug
+ aosp_car_x86_64-userdebug \
+ car_x86_64-userdebug \
diff --git a/car_x86_64.mk b/car_x86_64.mk
new file mode 100644
index 0000000..c5712e4
--- /dev/null
+++ b/car_x86_64.mk
@@ -0,0 +1,24 @@
+#
+# 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.
+
+$(call inherit-product, device/generic/car/common/car.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
+
+DEVICE_PACKAGE_OVERLAYS += device/generic/car/car_x86_64/overlay
+
+PRODUCT_NAME := car_x86_64
+PRODUCT_DEVICE := generic_x86_64
+PRODUCT_BRAND := Google
+PRODUCT_MODEL := Car on x86_64 emulator
diff --git a/car_x86_64/overlay/overlay/frameworks/base/core/res/res/values/config.xml b/car_x86_64/overlay/overlay/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..3639247
--- /dev/null
+++ b/car_x86_64/overlay/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,5 @@
+<resources>
+ <!-- The name of the package that will hold the dialer role by default. -->
+ <string name="config_defaultDialer" translatable="false">com.android.car.dialer</string>
+</resources>
+
