Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a4527ce authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 799812cd: Merge "Clean up makefile cruft." 

* commit '799812cd':
  Clean up makefile cruft.
parents 8791ebf0 799812cd

core/jni/Android.mk

+3 −1
Original line number Diff line number Diff line 
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 @@ endif 


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

libs/hwui/Android.mk

+4 −4
Original line number Diff line number Diff line 
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))

libs/usb/tests/AccessoryChat/accessorychat/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

media/mca/filterfw/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ include $(all-subdir-makefiles) 
# Build main libfilterfw



include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_MODULE := libfilterfw
@@ -30,7 +31,7 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_WHOLE_STATIC_LIBRARIES := libfilterfw_jni \

                                libfilterfw_native



LOCAL_SHARED_LIBRARIES := libstlport \

LOCAL_SHARED_LIBRARIES := \

                          libGLESv2 \

                          libEGL \

                          libgui \
@@ -48,4 +49,5 @@ LOCAL_SHARED_LIBRARIES := libstlport \ 
# part of a system image.

LOCAL_PRELINK_MODULE := false



include external/stlport/libstlport.mk

include $(BUILD_SHARED_LIBRARY)

tools/aapt/Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ aapt_src_files := \ 


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 @@ include $(BUILD_HOST_EXECUTABLE) 
# =========================================================

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 @@ LOCAL_SHARED_LIBRARIES := \ 
        libz



LOCAL_STATIC_LIBRARIES := \

        libstlport_static \

        libexpat_static



include external/stlport/libstlport.mk

include $(BUILD_EXECUTABLE)

endif