commit daa194a01049e581c177053740005f0f6cf4244d
author Chih-hung Hsieh <chh@google.com> Fri Oct 20 16:58:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 20 16:58:34 2017 +0000
tree 6701ff391e521923d989015b0d9bc9e37ff61355
parent 155759bd2155d1cfeb72c87f55b21a5107ae7db0
parent 60808a6831264e1638698813ee663698d8d9f524

Merge "Use -Werror in system/libufdt/utils/src"
am: 60808a6831

Change-Id: I91f6436cf44784ff5a9fe81d4ef5a75fb39cd580

tests/src/Android.mk

diff --git a/tests/src/Android.mk b/tests/src/Android.mk
index cc65321..a8af2bb 100644
--- a/tests/src/Android.mk
+++ b/tests/src/Android.mk
@@ -20,7 +20,6 @@
 
 LOCAL_MODULE := ufdt_gen_test_dts
 LOCAL_SRC_FILES := ufdt_gen_test_dts.c
-LOCAL_CFLAGS := -Wall -Werror
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -28,6 +27,23 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := ufdt_apply_overlay_host
+LOCAL_SRC_FILES := ufdt_overlay_test_app.c util.c
+LOCAL_STATIC_LIBRARIES := \
+    libufdt \
+    libfdt \
+    libufdt_sysdeps
+LOCAL_REQUIRED_MODULES := dtc
+LOCAL_CXX_STL := none
+
+include $(BUILD_HOST_EXECUTABLE)
+
+$(call dist-for-goals, dist_files, $(ALL_MODULES.ufdt_apply_overlay_host.BUILT):libufdt/ufdt_apply_overlay)
+
+###################################################
+
+include $(CLEAR_VARS)
+
 LOCAL_MODULE := ufdt_apply_overlay
 LOCAL_SRC_FILES := ufdt_overlay_test_app.c util.c
 LOCAL_STATIC_LIBRARIES := \
@@ -35,22 +51,6 @@
     libfdt \
     libufdt_sysdeps
 LOCAL_REQUIRED_MODULES := dtc
-LOCAL_CFLAGS := -Wall -Werror
-
-include $(BUILD_HOST_EXECUTABLE)
-
-###################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := ufdt_apply_overlay
-LOCAL_SRC_FILES := ufdt_overlay_test_app.c util.c
-LOCAL_STATIC_LIBRARIES := \
-    libufdt \
-    libfdt \
-    libufdt_sysdeps
-LOCAL_REQUIRED_MODULES := dtc
-LOCAL_CFLAGS := -Wall -Werror
 
 include $(BUILD_EXECUTABLE)
 
@@ -72,15 +72,17 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := extract_dtb
-LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SRC_FILES := extract_dtb.c util.c
 LOCAL_STATIC_LIBRARIES := \
     libfdt \
     libufdt_sysdeps
 LOCAL_REQUIRED_MODULES := dtc
+LOCAL_CXX_STL := none
 
 include $(BUILD_HOST_EXECUTABLE)
 
+$(call dist-for-goals, dist_files, $(ALL_MODULES.extract_dtb.BUILT):libufdt/extract_dtb)
+
 ###################################################
 
 include $(CLEAR_VARS)
@@ -91,7 +93,6 @@
     libfdt \
     libufdt_sysdeps
 LOCAL_REQUIRED_MODULES := dtc
-LOCAL_CFLAGS := -Wall -Werror
 
 include $(BUILD_EXECUTABLE)
 

utils/src/Android.mk

diff --git a/utils/src/Android.mk b/utils/src/Android.mk
index 9e0c9b4..f4ac52c 100644
--- a/utils/src/Android.mk
+++ b/utils/src/Android.mk
@@ -31,7 +31,10 @@
 	libfdt \
 	libufdt_sysdeps
 LOCAL_REQUIRED_MODULES := dtc
+LOCAL_CXX_STL := none
 
 include $(BUILD_HOST_EXECUTABLE)
 
 ###################################################
+
+$(call dist-for-goals, dist_files, $(ALL_MODULES.mkdtimg.BUILT):libufdt/mkdtimg)