LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 2085 into donut

Browse Source 
* changes:
  This fixes the build to always define the ANDROID macro, and remove an empty -I from the compiler options.
This commit is contained in:
Android (Google) Code Review
2009-05-25 02:10:35 -07:00
parent ceada119d3 93a4147f12
commit 8c093d5d2a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ndk/build/core/build-binary.mk
View File

@@ -29,6 +29,10 @@ include $(BUILD_SYSTEM)/build-module.mk
# list of generated object files # list of generated object files
LOCAL_OBJECTS := LOCAL_OBJECTS :=
# always define ANDROID when building binaries
#
LOCAL_CFLAGS := -DANDROID $(LOCAL_CFLAGS)
# #
# Add the default system shared libraries to the build # Add the default system shared libraries to the build
# #

2
ndk/build/core/definitions.mk
View File

@@ -370,7 +370,6 @@ $$(_OBJ): PRIVATE_CC := $$($$(my)CC)
$$(_OBJ): PRIVATE_CFLAGS := $$($$(my)CFLAGS) \ $$(_OBJ): PRIVATE_CFLAGS := $$($$(my)CFLAGS) \
$$($$(my)_$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \ $$($$(my)_$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \
-I$$(LOCAL_PATH) \ -I$$(LOCAL_PATH) \
-I$$(OBJS_DIR) \
$$(LOCAL_CFLAGS) \ $$(LOCAL_CFLAGS) \
$$(NDK_APP_CPPFLAGS) \ $$(NDK_APP_CPPFLAGS) \
$$(NDK_APP_CFLAGS) \ $$(NDK_APP_CFLAGS) \
@@ -430,7 +429,6 @@ $$(_OBJ): PRIVATE_CXX := $$($$(my)CXX)
$$(_OBJ): PRIVATE_CXXFLAGS := $$($$(my)CXXFLAGS) \ $$(_OBJ): PRIVATE_CXXFLAGS := $$($$(my)CXXFLAGS) \
$$($$(my)_$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \ $$($$(my)_$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \
-I$$(LOCAL_PATH) \ -I$$(LOCAL_PATH) \
-I$$(OBJS_DIR) \
$$(LOCAL_CFLAGS) \ $$(LOCAL_CFLAGS) \
$$(NDK_APP_CPPFLAGS) \ $$(NDK_APP_CPPFLAGS) \
$$(NDK_APP_CXXFLAGS) \ $$(NDK_APP_CXXFLAGS) \