Merge "Remove LOCAL_CLANG" am: 231c627a55 am: 1d510671c7

am: 1bc6334312

Change-Id: Ib794876faa040993e6b6d128fae28f80bfa91566
This commit is contained in:
Tao Bao
2017-07-25 22:05:23 +00:00
committed by android-build-merger
4 changed files with 0 additions and 6 deletions
-2
View File
@@ -34,7 +34,6 @@ LOCAL_MODULE := edify_parser
LOCAL_YACCFLAGS := -v LOCAL_YACCFLAGS := -v
LOCAL_CPPFLAGS += -Wno-unused-parameter LOCAL_CPPFLAGS += -Wno-unused-parameter
LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_CPPFLAGS += -Wno-deprecated-register
LOCAL_CLANG := true
LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
LOCAL_STATIC_LIBRARIES += libbase LOCAL_STATIC_LIBRARIES += libbase
@@ -51,7 +50,6 @@ LOCAL_CFLAGS := -Werror
LOCAL_CPPFLAGS := -Wno-unused-parameter LOCAL_CPPFLAGS := -Wno-unused-parameter
LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_CPPFLAGS += -Wno-deprecated-register
LOCAL_MODULE := libedify LOCAL_MODULE := libedify
LOCAL_CLANG := true
LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
LOCAL_STATIC_LIBRARIES += libbase LOCAL_STATIC_LIBRARIES += libbase
-2
View File
@@ -15,7 +15,6 @@ LOCAL_SRC_FILES := \
minadbd.cpp \ minadbd.cpp \
minadbd_services.cpp \ minadbd_services.cpp \
LOCAL_CLANG := true
LOCAL_MODULE := libminadbd LOCAL_MODULE := libminadbd
LOCAL_CFLAGS := $(minadbd_cflags) LOCAL_CFLAGS := $(minadbd_cflags)
LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration
@@ -27,7 +26,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := minadbd_test LOCAL_MODULE := minadbd_test
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_SRC_FILES := fuse_adb_provider_test.cpp LOCAL_SRC_FILES := fuse_adb_provider_test.cpp
-1
View File
@@ -32,7 +32,6 @@ LOCAL_CFLAGS := \
LOCAL_SRC_FILES := config.cpp ota_io.cpp LOCAL_SRC_FILES := config.cpp ota_io.cpp
LOCAL_MODULE_TAGS := eng LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := libotafault LOCAL_MODULE := libotafault
LOCAL_CLANG := true
LOCAL_C_INCLUDES := bootable/recovery LOCAL_C_INCLUDES := bootable/recovery
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs) LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs)
-1
View File
@@ -16,7 +16,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_SRC_FILES := uncrypt.cpp LOCAL_SRC_FILES := uncrypt.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
LOCAL_MODULE := uncrypt LOCAL_MODULE := uncrypt