summaryrefslogtreecommitdiffstats
path: root/libnativebridge/Android.mk
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2014-10-17 13:45:39 +0100
committerCalin Juravle <calin@google.com>2014-10-27 15:37:32 +0000
commit1402fbb13523fed9d96217e801df5678e3c01a6b (patch)
tree5b7da2b8bddbf1b418884b9c47a342dcd748c2ae /libnativebridge/Android.mk
parent6e93b246d41275ff55dfab2d747cf0d5c60b3652 (diff)
downloadsystem_core-1402fbb13523fed9d96217e801df5678e3c01a6b.zip
system_core-1402fbb13523fed9d96217e801df5678e3c01a6b.tar.gz
system_core-1402fbb13523fed9d96217e801df5678e3c01a6b.tar.bz2
Handle code_cache dir creation in libnativebridge
Also: - add kPreInitiliazed state to native bridge with check transition: kOpened->kPreInitialized->kInitialized - made sure we free the memory for the code_cache_path - tidy up some error messages - tidy up tests - add a dummy native bridge to test with Bug: 18027433 Bug: 18097480 (cherry picked from commit f9d9e2a2d96559c3165405d572b08e260156074a) Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
Diffstat (limited to 'libnativebridge/Android.mk')
-rw-r--r--libnativebridge/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/libnativebridge/Android.mk b/libnativebridge/Android.mk
index 6c2e43e..83169eb 100644
--- a/libnativebridge/Android.mk
+++ b/libnativebridge/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
-LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
@@ -30,11 +30,11 @@ LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := .cc
-LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
-include $(LOCAL_PATH)/tests/Android.mk \ No newline at end of file
+include $(LOCAL_PATH)/tests/Android.mk