hikey: Add hikey32 target for arm32
am: 5f59b7a9d7
Change-Id: I57787670f58a835217c85f74aebb789d9007df52
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4ae9e53..f10d1cf 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -11,4 +11,5 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/hikey.mk \
+$(LOCAL_DIR)/hikey32.mk \
$(LOCAL_DIR)/hikey960.mk
diff --git a/gralloc/Android.mk b/gralloc/Android.mk
index 2191b7e..fc62685 100644
--- a/gralloc/Android.mk
+++ b/gralloc/Android.mk
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ifeq ($(TARGET_PRODUCT),hikey)
LOCAL_PATH := $(call my-dir)
# HAL module implemenation, not prelinked and stored in
@@ -34,4 +33,3 @@
LOCAL_MODULE_RELATIVE_PATH := hw
include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/hikey32.mk b/hikey32.mk
new file mode 100644
index 0000000..a08ee8c
--- /dev/null
+++ b/hikey32.mk
@@ -0,0 +1,10 @@
+# Set zygote32 config before one in hikey.mk
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32
+PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc
+
+$(call inherit-product, device/linaro/hikey/hikey.mk)
+
+#
+# Overrides
+PRODUCT_NAME := hikey32
+PRODUCT_DEVICE := hikey32
diff --git a/hikey32/BoardConfig.mk b/hikey32/BoardConfig.mk
new file mode 100644
index 0000000..9d1fd4f
--- /dev/null
+++ b/hikey32/BoardConfig.mk
@@ -0,0 +1,18 @@
+include device/linaro/hikey/hikey/BoardConfig.mk
+
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH :=
+TARGET_2ND_ARCH_VARIANT :=
+TARGET_2ND_CPU_ABI :=
+TARGET_2ND_CPU_ABI2 :=
+TARGET_2ND_CPU_VARIANT :=
+
+TARGET_SUPPORTS_64_BIT_APPS := false
+
+
+
diff --git a/hikey32/board-info.txt b/hikey32/board-info.txt
new file mode 100644
index 0000000..f054721
--- /dev/null
+++ b/hikey32/board-info.txt
@@ -0,0 +1,2 @@
+require board=hikey
+require version-bootloader=0.4