| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") | 
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") | 
| 7 import("//build_overrides/v8.gni") | 7 import("//build_overrides/v8.gni") | 
| 8 import("//chrome/android/chrome_public_apk_tmpl.gni") | 8 import("//chrome/android/chrome_public_apk_tmpl.gni") | 
| 9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") | 
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") | 
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 389   ] | 389   ] | 
| 390   gypi_values = exec_script( | 390   gypi_values = exec_script( | 
| 391           "//build/gypi_to_gn.py", | 391           "//build/gypi_to_gn.py", | 
| 392           [ | 392           [ | 
| 393             rebase_path("chrome_apk.gyp"), | 393             rebase_path("chrome_apk.gyp"), | 
| 394             "--replace=<(chrome_native_sources_dir)=../browser/android/", | 394             "--replace=<(chrome_native_sources_dir)=../browser/android/", | 
| 395           ], | 395           ], | 
| 396           "scope", | 396           "scope", | 
| 397           [ "chrome_apk.gyp" ]) | 397           [ "chrome_apk.gyp" ]) | 
| 398   sources = gypi_values.chrome_public_app_native_sources | 398   sources = gypi_values.chrome_public_app_native_sources | 
| 399 |  | 
| 400   # TODO(GYP): |  | 
| 401   #'target_conditions': [ |  | 
| 402   #['component != "shared_library"', { |  | 
| 403   #'product_extension': '<(version_libchrome_short).so', |  | 
| 404   #}], |  | 
| 405   #], |  | 
| 406 } | 399 } | 
| 407 | 400 | 
| 408 chrome_public_apk_tmpl("chrome_public_apk") { | 401 chrome_public_apk_tmpl("chrome_public_apk") { | 
| 409   version_name = "Developer Build" | 402   version_name = "Developer Build" | 
| 410   version_code = "1" | 403   version_code = "1" | 
| 411   android_manifest = get_target_outputs(":chrome_public_apk_manifest") | 404   android_manifest = get_target_outputs(":chrome_public_apk_manifest") | 
| 412   android_manifest = android_manifest[1] | 405   android_manifest = android_manifest[1] | 
| 413   apk_name = "ChromePublic" | 406   apk_name = "ChromePublic" | 
| 414   native_libs = [ "libchrome_public.so" ] | 407   native_libs = [ "libchrome_public.so" ] | 
| 415   native_lib_version_rule = "//build/util:chrome_version_json" | 408   native_lib_version_rule = "//build/util:chrome_version_json" | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 449   apk_name = "ChromePublicTest" | 442   apk_name = "ChromePublicTest" | 
| 450   apk_under_test = ":chrome_public_apk" | 443   apk_under_test = ":chrome_public_apk" | 
| 451   android_manifest = chrome_public_test_apk_manifest | 444   android_manifest = chrome_public_test_apk_manifest | 
| 452   deps = [ | 445   deps = [ | 
| 453     ":chrome_public_test_apk_manifest", | 446     ":chrome_public_test_apk_manifest", | 
| 454     "//chrome/android:chrome_shared_test_java", | 447     "//chrome/android:chrome_shared_test_java", | 
| 455   ] | 448   ] | 
| 456   isolate_file = "../chrome_public_test_apk.isolate" | 449   isolate_file = "../chrome_public_test_apk.isolate" | 
| 457   proguard_enabled = !is_debug | 450   proguard_enabled = !is_debug | 
| 458 } | 451 } | 
| OLD | NEW | 
|---|