Create an x86_64.mk as a base of all 64-bit targets

diff --git a/nativebridge/nativebridge.mk b/nativebridge/nativebridge.mk
index 6a56095..09edeab 100644 (file)
--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -23,6 +23,12 @@ PRODUCT_PROPERTY_OVERRIDES := \
     ro.dalvik.vm.isa.arm=x86 \
     ro.enable.native.bridge.exec=1 \
 
+ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.dalvik.vm.isa.arm64=x86_64 \
+    ro.enable.native.bridge.exec64=1
+endif
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES := ro.dalvik.vm.native.bridge=libnb.so
 
 PRODUCT_PACKAGES := libnb

diff --git a/x86_64.mk b/x86_64.mk
new file mode 100644 (file)
index 0000000..4970b2a
--- /dev/null
+++ b/x86_64.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2016 The Android-x86 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.
+#
+
+$(call inherit-product,$(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product,$(LOCAL_PATH)/x86.mk)