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

Unified Diff: build/android/envsetup.sh

Issue 10377059: Android content shell bringup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix deps so builds on clean machine Created 8 years, 7 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 | « build/android/adb_install_content_shell ('k') | build/android/gdb_content_shell » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index ead8fdf469ca415525d14e1034b2f0fc9de778ec..dcf51ee136a5fcf36d5ba561740ff1663dc41e9a 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -62,6 +62,14 @@ case "${TARGET_PRODUCT-full}" in
return 1
esac
+# If we are building NDK/SDK, and in the upstream (open source) tree,
+# define a special variable for bringup purposes.
+case "${ANDROID_BUILD_TOP-undefined}" in
+ "undefined")
+ DEFINES+=" android_upstream_bringup=1"
+ ;;
+esac
+
toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}/prebuilt/"
export ANDROID_TOOLCHAIN="${toolchain_path}/${toolchain_dir}/bin/"
« no previous file with comments | « build/android/adb_install_content_shell ('k') | build/android/gdb_content_shell » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698