diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-11 23:26:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-11 23:26:26 +0000 |
| commit | 799812cd6f7f9aa4a87d81dafd273d51ac5ba992 (patch) | |
| tree | d10fa776649804e7b225f832a975a9814e66bb93 /libs | |
| parent | bcaaebb8a881951720190f4a6b9ffcbf871542af (diff) | |
| parent | 88ba339aefd74ffe0ea978ebb659a430f82940f0 (diff) | |
| download | frameworks_base-799812cd6f7f9aa4a87d81dafd273d51ac5ba992.zip frameworks_base-799812cd6f7f9aa4a87d81dafd273d51ac5ba992.tar.gz frameworks_base-799812cd6f7f9aa4a87d81dafd273d51ac5ba992.tar.bz2 | |
Merge "Clean up makefile cruft."
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/Android.mk | 8 | ||||
| -rw-r--r-- | libs/usb/tests/AccessoryChat/accessorychat/Android.mk | 3 |
2 files changed, 6 insertions, 5 deletions
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 @@ ifeq ($(USE_OPENGL_RENDERER),true) 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 @@ ifeq ($(USE_OPENGL_RENDERER),true) 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 @@ LOCAL_PATH:= $(call my-dir) ifeq ($(HOST_OS),linux) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional @@ -11,7 +12,6 @@ LOCAL_SRC_FILES := accessorychat.c 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 @@ endif # Build for device include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional |