From 7f6ee99363fae44d90a8648ecce02b171e50fbb1 Mon Sep 17 00:00:00 2001
From: Maunik Shah <mshah@codeaurora.org>
Date: Wed, 12 Nov 2014 19:42:04 +0530
Subject: [PATCH] Fix: CTS android.text.format.cts.TimeTests Failure

In CTS test, it is searching for french, japanise, UK language
support which was missing ealier. Adding these locales to fix CTS
failures

Change-Id: I4ce02a73dd6baaed43a5ca0499514d22ab9c0c85
---
 common.mk   |  3 +--
 common64.mk | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 common64.mk

diff --git a/common.mk b/common.mk
index 018090c6..5c932fe8 100644
--- a/common.mk
+++ b/common.mk
@@ -723,8 +723,7 @@ $(call inherit-product-if-exists, $(QCPATH)/common/config/device-vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 PRODUCT_BRAND := qcom
-PRODUCT_LOCALES := en_US es_US de_DE zh_CN
-PRODUCT_LOCALES += hdpi mdpi
+PRODUCT_AAPT_CONFIG += hdpi mdpi
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.extension_library=libqti-perfd-client.so \
diff --git a/common64.mk b/common64.mk
new file mode 100644
index 00000000..c118e3de
--- /dev/null
+++ b/common64.mk
@@ -0,0 +1,24 @@
+$(call inherit-product, device/qcom/common/base.mk)
+
+# For PRODUCT_COPY_FILES, the first instance takes precedence.
+# Since we want use QC specific files, we should inherit
+# device-vendor.mk first to make sure QC specific files gets installed.
+$(call inherit-product-if-exists, $(QCPATH)/common/config/device-vendor.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
+
+PRODUCT_BRAND := qcom
+PRODUCT_AAPT_CONFIG += hdpi mdpi
+
+ifndef PRODUCT_MANUFACTURER
+PRODUCT_MANUFACTURER := QUALCOMM
+endif
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.vendor.extension_library=libqti-perfd-client.so \
+    persist.radio.apm_sim_not_pwdn=1
+
+PRODUCT_PRIVATE_KEY := device/qcom/common/qcom.key
+
+$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
+#$(call inherit-product, frameworks/base/data/fonts/fonts.mk)
+#$(call inherit-product, frameworks/base/data/keyboards/keyboards.mk)