openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Don\'t hardcode gtest paths." 

am: 6b617c7

* commit '6b617c7c304f5e3b358e293237b3076b61285ee2':
  Don't hardcode gtest paths.

Change-Id: I5b7ba9dfe793d26eb4dc0415fd654ceba7a031ee
This commit is contained in:
Dan Albert 2016-04-26 21:30:08 +00:00 committed by android-build-merger
parent 182b310b1d 6b617c7c30
commit 50db67ef97
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