diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 22:39:17 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 22:39:17 +0000 |
| commit | 37434b4e738e5f256c93153827df88bd9f646790 (patch) | |
| tree | ee8a9ba173005a4671b987d355e70c6613293705 /android_webview/android_webview.gyp | |
| parent | c9a6815b947fedea1be51becd70b54ba3fe0377b (diff) | |
| download | chromium_src-37434b4e738e5f256c93153827df88bd9f646790.zip chromium_src-37434b4e738e5f256c93153827df88bd9f646790.tar.gz chromium_src-37434b4e738e5f256c93153827df88bd9f646790.tar.bz2 | |
Use _target_name instead of package_name for java*.gypi
We were using package_name as a unique name for naming output files and
directories. package_name was typically the same as _target_name or a
variation of it (like dropping _apk). Using _target_name instead means
we need to specify one less thing and it is (maybe?) guaranteed to be
unique.
TBR=brettw,joi,jar,fischman,zea,sky
BUG=
Review URL: https://chromiumcodereview.appspot.com/11308030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index f58bc8d..4f199f1 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -64,11 +64,11 @@ '<@(pak_inputs)', ], 'outputs': [ - '<(PRODUCT_DIR)/android_webview/assets/webviewchromium.pak', + '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak', ], 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], - }, + } ], }, { @@ -180,7 +180,6 @@ '../ui/ui.gyp:ui_java', ], 'variables': { - 'package_name': 'android_webview_java', 'java_in_dir': '../android_webview/java', }, 'includes': [ '../build/java.gypi' ], @@ -199,11 +198,13 @@ 'libwebviewchromium', ], 'variables': { - 'package_name': 'android_webview', 'apk_name': 'AndroidWebView', 'manifest_package_name': 'org.chromium.android_webview', 'java_in_dir': '../android_webview/java', 'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'], + 'additional_input_paths': [ + '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak', + ], }, 'includes': [ '../build/java_apk.gypi' ], }, |