diff options
| author | Elliott Hughes <enh@google.com> | 2022-07-13 20:46:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-13 20:46:50 +0000 |
| commit | 0dce6eef9b1e184d06a9714de7e64d259a873931 (patch) | |
| tree | 6c94c48407932c4f4faf9211d78f3c75e2bc126b | |
| parent | b7895fdbe81cacf290d80522a265ab97369cd040 (diff) | |
| parent | 4f33a1c84f9879fba0fef297e02e1072c54331a2 (diff) | |
| download | redfin-0dce6eef9b1e184d06a9714de7e64d259a873931.tar.gz | |
Merge "Add new build type." am: 87cf7941b8 am: 4f33a1c84f
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2062407
Change-Id: I7599178f90d44e9f57443f233243a95587e35fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | AndroidProducts.mk | 1 | ||||
| -rw-r--r-- | aosp_redfin_64_with_32.mk | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index bc17b20..1dc1835 100644 --- a/AndroidProducts.mk +++ b/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 \ diff --git a/aosp_redfin_64_with_32.mk b/aosp_redfin_64_with_32.mk new file mode 100644 index 0000000..a620164 --- /dev/null +++ b/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 |