Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2265)

Unified Diff: build/android/envsetup_functions.sh

Issue 11887034: [Android] Remove some unneeded gyp defines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 99eddd42c832c78cb4a4cadfb4d694b8598c4828..810b9815d6b4a8d1e02c91641547cc73c15847c3 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -233,15 +233,9 @@ sdk_build_init() {
common_vars_defines
- DEFINES+=" sdk_build=1"
-
# Sets android specific directories to NOT_SDK_COMPLIANT. This will allow
# android_gyp to generate make files, but will cause errors when (and only
# when) building targets that depend on these directories.
- DEFINES+=" android_src='NOT_SDK_COMPLIANT'"
- DEFINES+=" android_product_out=${CHROME_SRC}/out/android"
- DEFINES+=" android_lib='NOT_SDK_COMPLIANT'"
- DEFINES+=" android_static_lib='NOT_SDK_COMPLIANT'"
DEFINES+=" android_sdk=${ANDROID_SDK_ROOT}/${sdk_suffix}"
DEFINES+=" android_sdk_root=${ANDROID_SDK_ROOT}"
DEFINES+=" android_sdk_tools=${ANDROID_SDK_ROOT}/platform-tools"
@@ -286,9 +280,7 @@ ${ANDROID_SDK_VERSION}
print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/linux', \
'${ANDROID_BUILD_TOP}')")
DEFINES+=" android_build_type=1"
- DEFINES+=" sdk_build=0"
DEFINES+=" android_src=\$(GYP_ABS_ANDROID_TOP_DIR)"
- DEFINES+=" android_product_out=NOT_USED_ON_WEBVIEW"
DEFINES+=" android_sdk=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"
DEFINES+=" android_sdk_root=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"
DEFINES+=" android_sdk_tools=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK_TOOLS}"
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698