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

Unified Diff: android_webview/apk/system_webview_apk_common.gypi

Issue 802453002: [android_webview] Split out an apk folder from the glue folder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
Index: android_webview/apk/system_webview_apk_common.gypi
diff --git a/android_webview/glue/android_webview_glue_common.gypi b/android_webview/apk/system_webview_apk_common.gypi
similarity index 87%
rename from android_webview/glue/android_webview_glue_common.gypi
rename to android_webview/apk/system_webview_apk_common.gypi
index 1490cab3ad4c1a76db26912c5b987e362a60389e..c8da225193429bec4451d4f64edc9f980aed00c3 100644
--- a/android_webview/glue/android_webview_glue_common.gypi
+++ b/android_webview/apk/system_webview_apk_common.gypi
@@ -1,6 +1,9 @@
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+#
+# When making changes remember that this is shared with the internal .apk
+# build rules.
{
'type': 'none',
'dependencies': [
@@ -9,17 +12,14 @@
'<(DEPTH)/android_webview/android_webview.gyp:android_webview_pak',
],
'variables': {
- 'android_sdk_jar': '<(DEPTH)/third_party/android_platform/webview/frameworks_1622219.jar',
- 'java_in_dir': 'java',
'native_lib_target': 'libwebviewchromium',
'never_lint': 1,
- 'resource_dir': 'java/res',
'R_package': 'com.android.webview.chromium',
'R_package_relpath': 'com/android/webview/chromium',
'extensions_to_not_compress': 'pak',
'asset_location': '<(PRODUCT_DIR)/android_webview_assets',
'proguard_enabled': 'true',
- 'proguard_flags_paths': ['java/proguard.flags'],
+ 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'],
# TODO: crbug.com/405035 Find a better solution for WebView .pak files.
'additional_input_paths': [
'<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
« no previous file with comments | « android_webview/apk/java/res/drawable-xxhdpi/icon_webview.png ('k') | android_webview/glue/android_webview_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698