| Index: build/config/android/rules.gni
|
| diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
|
| index 090f55700ca812a3d4c02daf497d0d76a60a739d..06caaa8b3fd17677694d9e69719fb501433c1c70 100644
|
| --- a/build/config/android/rules.gni
|
| +++ b/build/config/android/rules.gni
|
| @@ -932,8 +932,8 @@ template("junit_binary") {
|
| "//testing/android/junit:junit_test_support",
|
| "//third_party/junit",
|
| "//third_party/mockito:mockito_java",
|
| - "//third_party/robolectric:robolectric_java",
|
| "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
|
| + "//third_party/robolectric:robolectric_java",
|
| ]
|
| }
|
| }
|
| @@ -1515,8 +1515,8 @@ template("android_apk") {
|
| proguard(_proguard_target) {
|
| deps = [
|
| ":$build_config_target",
|
| - ":$process_resources_target",
|
| ":$java_target",
|
| + ":$process_resources_target",
|
| ]
|
| inputs = [
|
| _build_config,
|
| @@ -1689,8 +1689,8 @@ template("android_apk") {
|
|
|
| native_libs_dir = _native_libs_dir
|
| deps = [
|
| - ":${_prepare_native_target_name}",
|
| ":${_manifest_rule}",
|
| + ":${_prepare_native_target_name}",
|
| ]
|
| incremental_deps = deps
|
| }
|
| @@ -1751,8 +1751,8 @@ template("android_apk") {
|
| # actual target, but instead loads them at runtime, we need to explicitly
|
| # depend on them here.
|
| public_deps = [
|
| - ":${_template_name}__create_incremental",
|
| ":${_create_incremental_script_rule_name}",
|
| + ":${_template_name}__create_incremental",
|
| ":${java_target}",
|
| ]
|
| if (_native_libs != []) {
|
|
|