Merge "Add an ndk product and device" am: e9d3c2e85a

Original change: https://android-review.googlesource.com/c/platform/build/+/1990890

Change-Id: I9b19c3561696755dea1e9ffcff8a6d814cffc30f
This commit is contained in:
Anton Hansson 2022-02-23 18:55:33 +00:00 committed by Automerger Merge Worker
commit 06c347653c
4 changed files with 45 additions and 0 deletions

View file

@ -0,0 +1,21 @@
# Copyright (C) 2022 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.
#
TARGET_ARCH_SUITE := ndk
TARGET_USES_64_BIT_BINDER := true
MALLOC_SVELTE := true
USE_SAFESTACK := false

View file

@ -0,0 +1,2 @@
This device is suitable for a soong-only build that builds for all the architectures
needed for the ndk.

View file

@ -61,6 +61,7 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/mainline_system_x86.mk \ $(LOCAL_DIR)/mainline_system_x86.mk \
$(LOCAL_DIR)/mainline_system_x86_64.mk \ $(LOCAL_DIR)/mainline_system_x86_64.mk \
$(LOCAL_DIR)/mainline_system_x86_arm.mk \ $(LOCAL_DIR)/mainline_system_x86_arm.mk \
$(LOCAL_DIR)/ndk.mk \
$(LOCAL_DIR)/sdk_arm64.mk \ $(LOCAL_DIR)/sdk_arm64.mk \
$(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sdk.mk \
$(LOCAL_DIR)/sdk_phone_arm64.mk \ $(LOCAL_DIR)/sdk_phone_arm64.mk \

21
target/product/ndk.mk Normal file
View file

@ -0,0 +1,21 @@
# Copyright (C) 2022 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.
#
# This device is suitable for soong-only build that builds for all the architectures
# needed for the ndk. It is not going to work for normal `lunch <foo> && m` workflows.
PRODUCT_NAME := ndk
PRODUCT_BRAND := Android
PRODUCT_DEVICE := ndk