From f490bb1962f9f806c62cc6e9aaf5539b87409b25 Mon Sep 17 00:00:00 2001
From: "Reynaldo H. Verdejo Pinochet" <reynaldo@collabora.com>
Date: Mon, 20 Aug 2012 21:50:22 -0400
Subject: Get rid of in-system top-level Android.mk entries

This file is _only_ for NDK builds.
---
 jni/Android.mk | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 69dfedc..ac5a30d 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -60,7 +60,6 @@ CONFIGURE_CC := $(TARGET_CC)
 CONFIGURE_INCLUDES := -I$(TOPMOST)/include
 CONFIGURE_LDFLAGS := -lc -ldl
 
-ifeq ($(NDK_BUILD),true)
 CONFIGURE_CFLAGS := \
     -nostdlib -Bdynamic \
     -Wl,-dynamic-linker,/system/bin/linker \
@@ -79,6 +78,7 @@ CONFIGURE_CFLAGS := \
     $(call host-path,\
         $(TARGET_CRTEND_O)) \
 	$(CONFIGURE_INCLUDES)
+
 CONFIGURE_LDFLAGS += -L$(SYSROOT)/usr/lib -L$(TARGET_OUT) -L$(GSTREAMER_AGGREGATE_TOP)/libs
 CONFIGURE_INCLUDES += -I$(SYSROOT)/usr/include \
 		-I$(GSTREAMER_AGGREGATE_TOP)/libid3tag \
@@ -87,37 +87,6 @@ CONFIGURE_INCLUDES += -I$(SYSROOT)/usr/include \
 		-I$(GSTREAMER_AGGREGATE_TOP)/faac/include
 CONFIGURE_CPP := $(TOOLCHAIN_PREFIX)cpp
 LIB := $(SYSROOT)/usr/lib
-else
-LIB := $(TARGET_OUT_SHARED_LIBRARIES)
-
-CONFIGURE_CC := $(patsubst %,$(PWD)/%,$(TARGET_CC))
-CONFIGURE_LDFLAGS += -L$(PWD)/$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-
-CONFIGURE_CFLAGS := \
-    -nostdlib -Bdynamic \
-    -Wl,-dynamic-linker,/system/bin/linker \
-    -Wl,--gc-sections \
-    -Wl,-z,nocopyreloc
-CONFIGURE_LDFLAGS += \
-    $(PWD)/$(TARGET_CRTBEGIN_DYNAMIC_O) \
-    $(call link-whole-archives,$(PRIVATE_WHOLE_STATIC_LIBRARIES))\
-    $(PRIVATE_STATIC_LIBRARIES) \
-    $(PWD)/$(TARGET_LIBGCC) \
-    $(PRIVATE_SHARED_LIBRARIES) \
-		$(PWD)/$(TARGET_CRTEND_O)
-
-
-CONFIGURE_CPP := $(PWD)/$(TARGET_TOOLS_PREFIX)cpp
-
-CONFIGURE_INCLUDES += \
-		$(foreach incdir, $(realpath $(C_INCLUDES) $(TARGET_C_INCLUDES)), \
-				-I$(incdir)) \
-		-I$(abspath $(TOP)/external/zlib) \
-		-I$(GSTREAMER_AGGREGATE_TOP)/libid3tag \
-		-I$(GSTREAMER_AGGREGATE_TOP)/libiconv \
-		-I$(GSTREAMER_AGGREGATE_TOP)/faad/include \
-		-I$(GSTREAMER_AGGREGATE_TOP)/faac/include
-endif
 
 CONFIGURE_CPPFLAGS := \
 	$(CONFIGURE_INCLUDES)
-- 
cgit v1.2.3