This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/hardware.c b/hardware.c | |
index 6713ea0..7e33b85 100644 | |
--- a/hardware.c | |
+++ b/hardware.c | |
@@ -31,9 +31,11 @@ | |
#if defined(__LP64__) | |
#define HAL_LIBRARY_PATH1 "/system/lib64/hw" | |
#define HAL_LIBRARY_PATH2 "/vendor/lib64/hw" | |
+#define HAL_LIBRARY_PATH3 "/usr/libexec/droid-hybris/system/lib64/hw" | |
#else |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Android.mk b/Android.mk | |
index 0ba92cf..89253c3 100644 | |
--- a/Android.mk | |
+++ b/Android.mk | |
@@ -15,1037 +15,8 @@ | |
# | |
LOCAL_PATH := $(call my-dir) | |
-# We have a special case here where we build the library's resources | |
-# independently from its code, so we need to find where the resource |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk | |
index cc5d544..00b1a56 100644 | |
--- a/opengl/libs/Android.mk | |
+++ b/opengl/libs/Android.mk | |
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES:= \ | |
EGL/Loader.cpp \ | |
# | |
-LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libGLES_trace | |
+LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libGLES_trace libdsyscalls |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/adb/Android.mk b/adb/Android.mk | |
index b70c153..cdd4948 100644 | |
--- a/adb/Android.mk | |
+++ b/adb/Android.mk | |
@@ -82,7 +82,9 @@ ifeq ($(USE_SYSDEPS_WIN32),) | |
LOCAL_STATIC_LIBRARIES += libcutils | |
endif | |
-include $(BUILD_HOST_EXECUTABLE) | |
+ifneq ($(HOST_OS),windows) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# set up the global environment | |
on init | |
+ | |
+ export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin | |
+ # This is not 64-bit safe -stskeeps | |
+ export LD_LIBRARY_PATH /usr/libexec/droid-hybris/lib-dev-alog:/vendor/lib:/system/lib | |
export ANDROID_BOOTLOGO 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/libc/Android.mk b/libc/Android.mk | |
index 3005092..db1c3e6 100644 | |
--- a/libc/Android.mk | |
+++ b/libc/Android.mk | |
@@ -65,6 +65,10 @@ libc_common_src_files := \ | |
stdio/snprintf.c\ | |
stdio/sprintf.c \ | |
+ifeq ($(TARGET_NEEDS_BIONIC_MD5),true) | |
+libc_common_src_files += bionic/md5.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/main.mk b/core/main.mk | |
index 9d6e233..0299609 100644 | |
--- a/core/main.mk | |
+++ b/core/main.mk | |
@@ -294,7 +294,7 @@ TARGET_BUILD_JAVA_SUPPORT_LEVEL := platform | |
# ----------------------------------------------------------------- | |
# The pdk (Platform Development Kit) build | |
-include build/core/pdk_config.mk | |
+#include build/core/pdk_config.mk |
NewerOlder