diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 21:13:32 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 21:13:32 +0000 |
| commit | 0f04ce965886b027eb13a9234a9a6563f3a987be (patch) | |
| tree | e1820541a7c913c6f016bd39a8bb2b7cb480d738 /build | |
| parent | f0f2241e15c48116e4e096aada603bd320aeef41 (diff) | |
| download | chromium_src-0f04ce965886b027eb13a9234a9a6563f3a987be.zip chromium_src-0f04ce965886b027eb13a9234a9a6563f3a987be.tar.gz chromium_src-0f04ce965886b027eb13a9234a9a6563f3a987be.tar.bz2 | |
[Android] Remove some unneeded gyp defines.
These are crufy and not needed anymore. A follow-up will start pushing used defines into gyp.
Review URL: https://codereview.chromium.org/11887034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup_functions.sh | 8 | ||||
| -rw-r--r-- | build/java_apk.gypi | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh index 99eddd4..810b981 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}" diff --git a/build/java_apk.gypi b/build/java_apk.gypi index d183e81..841a469 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -53,9 +53,7 @@ # dependencies from being re-included. # native_libs_paths - The path to any native library to be included in this # target. This should be a path in <(SHARED_LIB_DIR). A stripped copy of -# the library will be included in the apk and symbolic links to the -# unstripped copy will be added to <(android_product_out) to enable native -# debugging. +# the library will be included in the apk. # resource_dir - The directory for resources. # R_package - A custom Java package to generate the resource file R.java in. # By default, the package given in AndroidManifest.xml will be used. |