commit 5c7e2e603079c611b99302e5898b443440f2d9d7
author Dan Albert <danalbert@google.com> Wed Nov 12 03:44:41 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 12 03:44:42 2014 +0000
tree 670f75123146008bc7bc2a1453e8dc495b4d505e
parent 7d196df6f9990b5c93e0661fb0867971da7e6c34
parent f2dedb7a5f07dc5e0b814c82739aeb0097cf86fa

Merge "Move liblog tests and benchmarks to libc++."

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index d908ba8..44658c5 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -538,6 +538,7 @@
 {
     load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);
     load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT, NULL);
+    load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL);
     load_properties_from_file(PROP_PATH_FACTORY, "ro.*");
 
     load_override_properties();

libcutils/tests/Android.mk

diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk
index 76db5b1..afab3cc 100644
--- a/libcutils/tests/Android.mk
+++ b/libcutils/tests/Android.mk
@@ -42,8 +42,10 @@
     libcutils \
     liblog \
     libutils \
+    libc++abi \
+    libdl \
 
-LOCAL_CXX_STL := stlport_static
+LOCAL_CXX_STL := libc++_static
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64

libion/tests/Android.mk

diff --git a/libion/tests/Android.mk b/libion/tests/Android.mk
index 8dc7f9d..abf527a 100644
--- a/libion/tests/Android.mk
+++ b/libion/tests/Android.mk
@@ -21,7 +21,6 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
 LOCAL_SHARED_LIBRARIES += libion
-LOCAL_STATIC_LIBRARIES += libgtest_main
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers
 LOCAL_SRC_FILES := \
 	ion_test_fixture.cpp \