nativebridge: remove cpuinfo

diff --git a/nativebridge/Android.mk b/nativebridge/Android.mk
index 51fdb43..11fc008 100644 (file)
--- a/nativebridge/Android.mk
+++ b/nativebridge/Android.mk
@@ -18,5 +18,6 @@ LOCAL_CFLAGS := -Werror -Wall
 LOCAL_CPPFLAGS := -std=c++11
 LOCAL_SHARED_LIBRARIES := libcutils libdl liblog
 LOCAL_MULTILIB := both
+LOCAL_POST_INSTALL_CMD := mkdir -p $(TARGET_OUT)/{lib/arm,$(if $(filter true,$(TARGET_IS_64_BIT)),lib64/arm64)}
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/nativebridge/lib/arm/cpuinfo b/nativebridge/lib/arm/cpuinfo
deleted file mode 100644 (file)
index 1940ac6..0000000
--- a/nativebridge/lib/arm/cpuinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-Processor      : ARMv7 processor rev 1 (v7l)
-BogoMIPS       : 1500.0
-Features       : neon vfp swp half thumb fastmult edsp vfpv3
-CPU implementer        : 0x69
-CPU architecture: 7
-CPU variant    : 0x1
-CPU part       : 0x001
-CPU revision   : 1
-
-Hardware       : placeholder
-Revision       : 0001
-Serial         : 0000000000000001

diff --git a/nativebridge/lib64/arm64/cpuinfo b/nativebridge/lib64/arm64/cpuinfo
deleted file mode 100644 (file)
index 3b848dd..0000000
--- a/nativebridge/lib64/arm64/cpuinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-Processor      : ARMv8 processor rev 1 (aarch64)
-processor       : 0
-processor       : 1
-Features       : fp asimd aes pmull sha1 sha2
-CPU implementer        : 0x4e
-CPU architecture: AArch64
-CPU variant    : 0x0
-CPU part       : 0x000
-CPU revision    : 0
-
-Hardware       : placeholder
-Revision       : 0000
-Serial         : 0000000000000000

diff --git a/nativebridge/lib64/arm64/cpuinfo.64in32mode b/nativebridge/lib64/arm64/cpuinfo.64in32mode
deleted file mode 100644 (file)
index a80db5e..0000000
--- a/nativebridge/lib64/arm64/cpuinfo.64in32mode
+++ /dev/null
@@ -1,13 +0,0 @@
-Processor      : ARMv8 processor rev 1 (aarch64)
-processor      : 0
-processor      : 1
-Features       : fp asimd aes pmull sha1 sha2 wp half thumb fastmult vfp edsp neon vfpv3 tlsi vfpv4 idiva idivt
-CPU implementer        : 0x4e
-CPU architecture: 8
-CPU variant    : 0x0
-CPU part       : 0x000
-CPU revision   : 0
-
-Hardware       : placeholder
-Revision       : 0000
-Serial         : 0000000000000000

diff --git a/nativebridge/nativebridge.mk b/nativebridge/nativebridge.mk
index 8622ffe..6a56095 100644 (file)
--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -17,14 +17,6 @@ NATIVE_BRIDGE_ABI_LIST_64_BIT := arm64-v8a
 
 LOCAL_SRC_FILES := bin/enable_nativebridge
 
-ifneq ($(filter %x86_64/,$(PRODUCT_DIR)),)
-
-LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(shell find $(LOCAL_PATH)/lib64/arm64 -type f))
-
-endif
-
-LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(shell find $(LOCAL_PATH)/lib/arm -type f))
-
 PRODUCT_COPY_FILES := $(foreach f,$(LOCAL_SRC_FILES),$(LOCAL_PATH)/$(f):system/$(f))
 
 PRODUCT_PROPERTY_OVERRIDES := \