| Index: build/android/envsetup_functions.sh
|
| diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
|
| index e3e7c260118c96936690c676c324971567905340..55f7b55de87642be2bd5aba2dcb9a6c8429a28b6 100755
|
| --- a/build/android/envsetup_functions.sh
|
| +++ b/build/android/envsetup_functions.sh
|
| @@ -291,10 +291,10 @@ ${ANDROID_SDK_VERSION}
|
| DEFINES+=" android_webview_build=1"
|
| # temporary until all uses of android_build_type are gone (crbug.com/184431)
|
| DEFINES+=" android_build_type=1"
|
| - DEFINES+=" android_src=\$(GYP_ABS_ANDROID_TOP_DIR)"
|
| - 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}"
|
| + DEFINES+=" android_src=\$(PWD)"
|
| + DEFINES+=" android_sdk=\$(PWD)/${ANDROID_SDK}"
|
| + DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
|
| + DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
|
| DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
|
| DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
|
| export GYP_DEFINES="${DEFINES}"
|
|
|