Clean up makefile cruft.
The build system already takes care of all these things.
Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index b5e068d..d19bcae2 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -1,5 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA
LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL
@@ -218,9 +219,10 @@
LOCAL_SHARED_LIBRARIES += \
libdl
+
# we need to access the private Bionic header
# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private
+LOCAL_C_INCLUDES += bionic/libc/private
ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 411c133..490921e 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -1,5 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
# Only build libhwui when USE_OPENGL_RENDERER is
# defined in the current device/board configuration
@@ -65,14 +66,12 @@
ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))
LOCAL_CFLAGS += -DANDROID_ENABLE_RENDERSCRIPT
- LOCAL_SHARED_LIBRARIES += libRS libRScpp libstlport
+ LOCAL_SHARED_LIBRARIES += libRS libRScpp
LOCAL_C_INCLUDES += \
$(intermediates) \
frameworks/rs/cpp \
frameworks/rs \
- external/stlport/stlport \
- bionic/ \
- bionic/libstdc++/include
+
endif
ifndef HWUI_COMPILE_SYMBOLS
@@ -83,6 +82,7 @@
LOCAL_CFLAGS += -fno-omit-frame-pointer -marm -mapcs
endif
+ include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libs/usb/tests/AccessoryChat/accessorychat/Android.mk b/libs/usb/tests/AccessoryChat/accessorychat/Android.mk
index 300224a..51f2111 100644
--- a/libs/usb/tests/AccessoryChat/accessorychat/Android.mk
+++ b/libs/usb/tests/AccessoryChat/accessorychat/Android.mk
@@ -4,6 +4,7 @@
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := optional
@@ -11,7 +12,6 @@
LOCAL_MODULE := accessorychat
-LOCAL_C_INCLUDES += bionic/libc/kernel/common
LOCAL_STATIC_LIBRARIES := libusbhost libcutils
LOCAL_LDLIBS += -lpthread
LOCAL_CFLAGS := -g -O0
@@ -22,6 +22,7 @@
# Build for device
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := optional
diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk
index 2a9448d..a5b4b27 100644
--- a/media/mca/filterfw/Android.mk
+++ b/media/mca/filterfw/Android.mk
@@ -22,6 +22,7 @@
# Build main libfilterfw
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE := libfilterfw
@@ -30,7 +31,7 @@
LOCAL_WHOLE_STATIC_LIBRARIES := libfilterfw_jni \
libfilterfw_native
-LOCAL_SHARED_LIBRARIES := libstlport \
+LOCAL_SHARED_LIBRARIES := \
libGLESv2 \
libEGL \
libgui \
@@ -48,4 +49,5 @@
# part of a system image.
LOCAL_PRELINK_MODULE := false
+include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 2949f8e..162edc4 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -31,6 +31,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := $(aapt_src_files)
@@ -73,14 +74,12 @@
# =========================================================
ifneq ($(SDK_ONLY),true)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := $(aapt_src_files)
LOCAL_MODULE := aapt
-LOCAL_C_INCLUDES += bionic
-LOCAL_C_INCLUDES += bionic/libstdc++/include
-LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_C_INCLUDES += external/libpng
LOCAL_C_INCLUDES += external/zlib
@@ -95,9 +94,9 @@
libz
LOCAL_STATIC_LIBRARIES := \
- libstlport_static \
libexpat_static
+include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
endif