Merge "Add new build type." am: 87cf7941b8

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2062407

Change-Id: I8dfd13c50c4987fb850788f947d4e39b8597ee49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

AndroidProducts.mk

@@ -17,6 +17,7 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_redfin.mk \
     $(LOCAL_DIR)/aosp_redfin_64.mk \
+    $(LOCAL_DIR)/aosp_redfin_64_with_32.mk \
     $(LOCAL_DIR)/vf/aosp_redfin_vf.mk \
     $(LOCAL_DIR)/aosp_redfin_hwasan.mk \
 

aosp_redfin_64_with_32.mk

@@ -0,0 +1,23 @@
+#
+# Copyright 2018 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.
+#
+
+# Build all of the 32 bit code, but only the vendor partition enables 64 bit.
+ZYGOTE_FORCE_64 := true
+
+$(call inherit-product, device/google/redfin/aosp_redfin.mk)
+
+PRODUCT_NAME := aosp_redfin_64_with_32
+PRODUCT_MODEL := AOSP on Redfin 64-bit only zygote with 32 bit support