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

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

am 6746b74d: resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp 

* commit '6746b74de540f2899f886cd25827f3ca9901de32':
  Clean up makefile cruft.
parents 9cafe2fd 8ab25d82

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
@@ -255,9 +256,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 −3
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
@@ -82,15 +83,14 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
	LOCAL_MODULE := libhwui

	LOCAL_MODULE_TAGS := optional



	include external/stlport/libstlport.mk



	ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))

		LOCAL_CFLAGS += -DANDROID_ENABLE_RENDERSCRIPT

		LOCAL_SHARED_LIBRARIES += libRS libRScpp

		LOCAL_C_INCLUDES += \

			$(intermediates) \

			frameworks/rs/cpp \

			frameworks/rs

			frameworks/rs \



	endif



	ifndef HWUI_COMPILE_SYMBOLS
@@ -104,6 +104,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
	# Defaults for ATRACE_TAG and LOG_TAG for libhwui

	LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"



	include external/stlport/libstlport.mk

	include $(BUILD_SHARED_LIBRARY)



	include $(call all-makefiles-under,$(LOCAL_PATH))

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

+2 −0
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
@@ -21,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

+2 −3
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ include $(BUILD_HOST_EXECUTABLE) 
# Build the host tests: libaapt_tests

# ==========================================================

include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_MODULE := libaapt_tests
@@ -152,8 +153,6 @@ LOCAL_MODULE := aapt 
LOCAL_SRC_FILES := $(aaptSources) $(aaptMain)

LOCAL_C_INCLUDES += \

    $(aaptCIncludes) \

    bionic \

    external/stlport/stlport



LOCAL_SHARED_LIBRARIES := \

    libandroidfw \
@@ -164,12 +163,12 @@ LOCAL_SHARED_LIBRARIES := \ 
    libz



LOCAL_STATIC_LIBRARIES := \

    libstlport_static \

    libexpat_static



LOCAL_CFLAGS += $(aaptCFlags)

LOCAL_CPPFLAGS += -Wno-non-virtual-dtor



include external/stlport/libstlport.mk

include $(BUILD_EXECUTABLE)



endif # Not SDK_ONLY