ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Don\'t hardcode gtest paths." am: 6b617c7

Browse source 
am: 50db67e

* commit '50db67ef973547d6c2c0c3af39f78760fdf3d0f3':
  Don't hardcode gtest paths.

Change-Id: I422395f16dab27d992b4514e5d8b238e0e4f8675
This commit is contained in:
Treehugger Robot 2016-04-26 21:34:02 +00:00 • committed by android-build-merger
commit 3bee0a2d55
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstat/Android.mk
View file

@ -16,8 +16,6 @@
LOCAL_PATH := $(call my-dir)
bootstat_c_includes := external/gtest/include
bootstat_lib_src_files := \
boot_event_record_store.cpp \
event_log_list_builder.cpp \
@ -57,7 +55,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libbootstat
LOCAL_CFLAGS := $(bootstat_cflags)
LOCAL_C_INCLUDES := $(bootstat_c_includes)
LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_prod
LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
LOCAL_SRC_FILES := $(bootstat_lib_src_files)
# Clang is required because of C++14
@ -72,7 +70,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libbootstat_debug
LOCAL_CFLAGS := $(bootstat_cflags)
LOCAL_C_INCLUDES := $(bootstat_c_includes)
LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_prod
LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
LOCAL_SRC_FILES := $(bootstat_lib_src_files)
# Clang is required because of C++14
@ -87,7 +85,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libbootstat_host_debug
LOCAL_CFLAGS := $(bootstat_debug_cflags)
LOCAL_C_INCLUDES := $(bootstat_c_includes)
LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_prod
LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
LOCAL_SRC_FILES := $(bootstat_lib_src_files)
# Clang is required because of C++14
@ -102,7 +100,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := bootstat
LOCAL_CFLAGS := $(bootstat_cflags)
LOCAL_C_INCLUDES := $(bootstat_c_includes)
LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_prod
LOCAL_SHARED_LIBRARIES := $(bootstat_shared_libs)
LOCAL_STATIC_LIBRARIES := libbootstat
LOCAL_INIT_RC := bootstat.rc