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

Side by Side Diff: build/android/envsetup.sh

Issue 10735004: Specify path to aidl tool in gyp file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/java_aidl.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Sets up environment for building Chromium on Android. Only Android NDK, 7 # Sets up environment for building Chromium on Android. Only Android NDK,
8 # Revision 6b on Linux or Mac is offically supported. 8 # Revision 6b on Linux or Mac is offically supported.
9 # 9 #
10 # To run this script, the system environment ANDROID_NDK_ROOT must be set 10 # To run this script, the system environment ANDROID_NDK_ROOT must be set
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 DEFINES+=" linux_use_tcmalloc=0" 145 DEFINES+=" linux_use_tcmalloc=0"
146 DEFINES+=" disable_nacl=1" 146 DEFINES+=" disable_nacl=1"
147 DEFINES+=" remoting=0" 147 DEFINES+=" remoting=0"
148 DEFINES+=" p2p_apis=0" 148 DEFINES+=" p2p_apis=0"
149 DEFINES+=" enable_touch_events=1" 149 DEFINES+=" enable_touch_events=1"
150 DEFINES+=" build_ffmpegsumo=0" 150 DEFINES+=" build_ffmpegsumo=0"
151 DEFINES+=" gtest_target_type=shared_library" 151 DEFINES+=" gtest_target_type=shared_library"
152 DEFINES+=" branding=Chromium" 152 DEFINES+=" branding=Chromium"
153 DEFINES+=\ 153 DEFINES+=\
154 " android_sdk=${ANDROID_SDK_ROOT}/platforms/android-${ANDROID_SDK_VERSION}" 154 " android_sdk=${ANDROID_SDK_ROOT}/platforms/android-${ANDROID_SDK_VERSION}"
155 DEFINES+=" android_sdk_tools=${ANDROID_SDK_ROOT}/platform-tools"
155 156
156 export GYP_DEFINES="${DEFINES}" 157 export GYP_DEFINES="${DEFINES}"
157 158
158 # Use the "android" flavor of the Makefile generator for both Linux and OS X. 159 # Use the "android" flavor of the Makefile generator for both Linux and OS X.
159 export GYP_GENERATORS="make-android" 160 export GYP_GENERATORS="make-android"
160 161
161 # Use our All target as the default 162 # Use our All target as the default
162 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 163 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
163 164
164 # We want to use our version of "all" targets. 165 # We want to use our version of "all" targets.
165 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp" 166 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"
OLDNEW
« no previous file with comments | « no previous file | build/java_aidl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698