Merge "Android.mk: remove $TOP in LOCAL_C_INCLUDES"
diff --git a/cmds/screenrecord/Android.mk b/cmds/screenrecord/Android.mk
index 6747e60..6f210e6 100644
--- a/cmds/screenrecord/Android.mk
+++ b/cmds/screenrecord/Android.mk
@@ -31,7 +31,7 @@
LOCAL_C_INCLUDES := \
frameworks/av/media/libstagefright \
frameworks/av/media/libstagefright/include \
- $(TOP)/frameworks/native/include/media/openmax \
+ frameworks/native/include/media/openmax \
external/jpeg
LOCAL_CFLAGS += -Wno-multichar
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index b28d509..d952428 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -14,7 +14,7 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
frameworks/av/media/libstagefright/include \
- $(TOP)/frameworks/native/include/media/openmax \
+ frameworks/native/include/media/openmax \
external/jpeg \
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -38,8 +38,8 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax \
- $(TOP)/frameworks/native/include/media/hardware
+ frameworks/native/include/media/openmax \
+ frameworks/native/include/media/hardware
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -62,8 +62,8 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax \
- $(TOP)/frameworks/native/include/media/hardware
+ frameworks/native/include/media/openmax \
+ frameworks/native/include/media/hardware
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -87,7 +87,7 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -110,7 +110,7 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -133,7 +133,7 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -157,7 +157,7 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -189,10 +189,10 @@
libRScpp \
LOCAL_C_INCLUDES:= \
- $(TOP)/frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax \
- $(TOP)/frameworks/rs/cpp \
- $(TOP)/frameworks/rs \
+ frameworks/av/media/libstagefright \
+ frameworks/native/include/media/openmax \
+ frameworks/rs/cpp \
+ frameworks/rs \
intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,)
LOCAL_C_INCLUDES += $(intermediates)
@@ -221,7 +221,7 @@
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 1786e6b..2e6d0f1 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -44,15 +44,15 @@
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/av/media/libstagefright/include \
- $(TOP)/frameworks/av/media/libstagefright/rtsp \
- $(TOP)/frameworks/av/media/libstagefright/wifi-display \
- $(TOP)/frameworks/av/media/libstagefright/webm \
- $(TOP)/frameworks/av/include/media \
- $(TOP)/frameworks/av/include/camera \
- $(TOP)/frameworks/native/include/media/openmax \
- $(TOP)/frameworks/native/include/media/hardware \
- $(TOP)/external/tremolo/Tremolo \
+ frameworks/av/media/libstagefright/include \
+ frameworks/av/media/libstagefright/rtsp \
+ frameworks/av/media/libstagefright/wifi-display \
+ frameworks/av/media/libstagefright/webm \
+ frameworks/av/include/media \
+ frameworks/av/include/camera \
+ frameworks/native/include/media/openmax \
+ frameworks/native/include/media/hardware \
+ external/tremolo/Tremolo \
LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall
diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk
index a0e633c..21487ca 100644
--- a/media/libmediaplayerservice/nuplayer/Android.mk
+++ b/media/libmediaplayerservice/nuplayer/Android.mk
@@ -16,14 +16,14 @@
StreamingSource.cpp \
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/av/media/libstagefright \
- $(TOP)/frameworks/av/media/libstagefright/httplive \
- $(TOP)/frameworks/av/media/libstagefright/include \
- $(TOP)/frameworks/av/media/libstagefright/mpeg2ts \
- $(TOP)/frameworks/av/media/libstagefright/rtsp \
- $(TOP)/frameworks/av/media/libstagefright/timedtext \
- $(TOP)/frameworks/av/media/libmediaplayerservice \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/av/media/libstagefright \
+ frameworks/av/media/libstagefright/httplive \
+ frameworks/av/media/libstagefright/include \
+ frameworks/av/media/libstagefright/mpeg2ts \
+ frameworks/av/media/libstagefright/rtsp \
+ frameworks/av/media/libstagefright/timedtext \
+ frameworks/av/media/libmediaplayerservice \
+ frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Werror -Wall
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
index 5c28e46..42b139a 100644
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
@@ -34,9 +34,9 @@
StateQueue.cpp
LOCAL_C_INCLUDES := \
- $(TOPDIR)frameworks/av/services/audiopolicy \
- $(TOPDIR)frameworks/av/services/medialog \
- $(TOPDIR)external/sonic \
+ frameworks/av/services/audiopolicy \
+ frameworks/av/services/medialog \
+ external/sonic \
$(call include-path-for, audio-effects) \
$(call include-path-for, audio-utils)
diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk
index 69d22c0..9f6b300 100644
--- a/services/audiopolicy/Android.mk
+++ b/services/audiopolicy/Android.mk
@@ -19,12 +19,12 @@
endif
LOCAL_C_INCLUDES := \
- $(TOPDIR)frameworks/av/services/audioflinger \
+ frameworks/av/services/audioflinger \
$(call include-path-for, audio-effects) \
$(call include-path-for, audio-utils) \
- $(TOPDIR)frameworks/av/services/audiopolicy/common/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface \
- $(TOPDIR)frameworks/av/services/audiopolicy/utilities
+ frameworks/av/services/audiopolicy/common/include \
+ frameworks/av/services/audiopolicy/engine/interface \
+ frameworks/av/services/audiopolicy/utilities
LOCAL_SHARED_LIBRARIES := \
libcutils \
@@ -75,7 +75,7 @@
parameter-framework.policy \
audio_policy_criteria.conf \
-LOCAL_C_INCLUDES += $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/include
+LOCAL_C_INCLUDES += frameworks/av/services/audiopolicy/engineconfigurable/include
LOCAL_SHARED_LIBRARIES += libaudiopolicyengineconfigurable
@@ -86,9 +86,9 @@
endif # ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
LOCAL_C_INCLUDES += \
- $(TOPDIR)frameworks/av/services/audiopolicy/common/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface \
- $(TOPDIR)frameworks/av/services/audiopolicy/utilities
+ frameworks/av/services/audiopolicy/common/include \
+ frameworks/av/services/audiopolicy/engine/interface \
+ frameworks/av/services/audiopolicy/utilities
LOCAL_STATIC_LIBRARIES := \
libmedia_helper \
@@ -124,8 +124,8 @@
libaudiopolicycomponents
LOCAL_C_INCLUDES += \
- $(TOPDIR)frameworks/av/services/audiopolicy/common/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface
+ frameworks/av/services/audiopolicy/common/include \
+ frameworks/av/services/audiopolicy/engine/interface
LOCAL_CFLAGS := -Wall -Werror
diff --git a/services/audiopolicy/common/managerdefinitions/Android.mk b/services/audiopolicy/common/managerdefinitions/Android.mk
index 02118c4..96591df 100644
--- a/services/audiopolicy/common/managerdefinitions/Android.mk
+++ b/services/audiopolicy/common/managerdefinitions/Android.mk
@@ -33,9 +33,9 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/common/include \
- $(TOPDIR)frameworks/av/services/audiopolicy \
- $(TOPDIR)frameworks/av/services/audiopolicy/utilities \
+ frameworks/av/services/audiopolicy/common/include \
+ frameworks/av/services/audiopolicy \
+ frameworks/av/services/audiopolicy/utilities \
ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
@@ -46,8 +46,8 @@
LOCAL_SHARED_LIBRARIES += libicuuc
LOCAL_C_INCLUDES += \
- $(TOPDIR)external/libxml2/include \
- $(TOPDIR)external/icu/icu4c/source/common
+ external/libxml2/include \
+ external/icu/icu4c/source/common
else
diff --git a/services/audiopolicy/engineconfigurable/Android.mk b/services/audiopolicy/engineconfigurable/Android.mk
index 116077d..1924d1d 100755
--- a/services/audiopolicy/engineconfigurable/Android.mk
+++ b/services/audiopolicy/engineconfigurable/Android.mk
@@ -16,9 +16,9 @@
src/InputSource.cpp \
audio_policy_engine_includes_common := \
- $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/interface \
- $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface
+ frameworks/av/services/audiopolicy/engineconfigurable/include \
+ frameworks/av/services/audiopolicy/engineconfigurable/interface \
+ frameworks/av/services/audiopolicy/engine/interface
LOCAL_CFLAGS += \
-Wall \
@@ -33,7 +33,7 @@
$(TARGET_OUT_HEADERS)/hw \
$(call include-path-for, frameworks-av) \
$(call include-path-for, audio-utils) \
- $(TOPDIR)frameworks/av/services/audiopolicy/common/include
+ frameworks/av/services/audiopolicy/common/include
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
index 0e44f2c..3559cf1 100755
--- a/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
@@ -21,9 +21,9 @@
-fvisibility=hidden
LOCAL_C_INCLUDES := \
- $(TOPDIR)frameworks/av/services/audiopolicy/common/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/interface \
+ frameworks/av/services/audiopolicy/common/include \
+ frameworks/av/services/audiopolicy/engineconfigurable/include \
+ frameworks/av/services/audiopolicy/engineconfigurable/interface \
LOCAL_SHARED_LIBRARIES := \
libaudiopolicyengineconfigurable \
diff --git a/services/audiopolicy/engineconfigurable/wrapper/Android.mk b/services/audiopolicy/engineconfigurable/wrapper/Android.mk
index c5990ac..9788e0e 100644
--- a/services/audiopolicy/engineconfigurable/wrapper/Android.mk
+++ b/services/audiopolicy/engineconfigurable/wrapper/Android.mk
@@ -8,9 +8,9 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engineconfigurable/interface \
- $(TOPDIR)frameworks/av/services/audiopolicy/utilities/convert \
+ frameworks/av/services/audiopolicy/engineconfigurable/include \
+ frameworks/av/services/audiopolicy/engineconfigurable/interface \
+ frameworks/av/services/audiopolicy/utilities/convert \
LOCAL_SRC_FILES:= ParameterManagerWrapper.cpp
diff --git a/services/audiopolicy/enginedefault/Android.mk b/services/audiopolicy/enginedefault/Android.mk
index e6de8ae..6a5655d 100755
--- a/services/audiopolicy/enginedefault/Android.mk
+++ b/services/audiopolicy/enginedefault/Android.mk
@@ -11,7 +11,7 @@
audio_policy_engine_includes_common := \
$(LOCAL_PATH)/include \
- $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface
+ frameworks/av/services/audiopolicy/engine/interface
LOCAL_CFLAGS += \
-Wall \
@@ -27,7 +27,7 @@
$(call include-path-for, frameworks-av) \
$(call include-path-for, audio-utils) \
$(call include-path-for, bionic) \
- $(TOPDIR)frameworks/av/services/audiopolicy/common/include
+ frameworks/av/services/audiopolicy/common/include
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index a5f0751..de0bdfd 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -5,8 +5,8 @@
LOCAL_SRC_FILES := MediaCodecService.cpp
LOCAL_SHARED_LIBRARIES := libmedia libbinder libutils liblog libstagefright_omx
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/av/media/libstagefright \
+ frameworks/native/include/media/openmax
LOCAL_MODULE:= libmediacodecservice
LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)
@@ -19,8 +19,8 @@
LOCAL_SHARED_LIBRARIES := libmedia libmediacodecservice libbinder libutils \
liblog libminijail
LOCAL_C_INCLUDES := \
- $(TOP)/frameworks/av/media/libstagefright \
- $(TOP)/frameworks/native/include/media/openmax
+ frameworks/av/media/libstagefright \
+ frameworks/native/include/media/openmax
LOCAL_MODULE:= mediacodec
LOCAL_32_BIT_ONLY := true
LOCAL_INIT_RC := mediacodec.rc
diff --git a/services/mediaresourcemanager/Android.mk b/services/mediaresourcemanager/Android.mk
index c9cd8cc..5823036 100644
--- a/services/mediaresourcemanager/Android.mk
+++ b/services/mediaresourcemanager/Android.mk
@@ -11,7 +11,7 @@
LOCAL_32_BIT_ONLY := true
LOCAL_C_INCLUDES += \
- $(TOPDIR)frameworks/av/include
+ frameworks/av/include
LOCAL_CFLAGS += -Werror -Wall
diff --git a/services/soundtrigger/Android.mk b/services/soundtrigger/Android.mk
index 0f5bbba..8408c66 100644
--- a/services/soundtrigger/Android.mk
+++ b/services/soundtrigger/Android.mk
@@ -35,7 +35,7 @@
libserviceutility
LOCAL_C_INCLUDES += \
- $(TOPDIR)frameworks/av/services/audioflinger
+ frameworks/av/services/audioflinger
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
