Commit 28e50931 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Fix missing dep from compile_resources -> sdk jar

Can repro the failure via:
  cd out/Debug
  rm gen/arsc/apks/MonochromePublicTestAr.ap_
  rm lib.java/third_party/android_system_sdk/android_system.jar
  ninja gen/arsc/apks/MonochromePublicTestAr.ap_

Change-Id: I6885219d272510ec024263a3567fb27acf68050f
Reviewed-on: https://chromium-review.googlesource.com/1205500Reviewed-by: default avatarTibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588876}
parent c64880bd
......@@ -2171,6 +2171,11 @@ if (enable_java_templates) {
":$_merge_manifest_target",
":$_build_config_target",
]
if (defined(invoker.alternative_android_sdk_dep)) {
deps += [ invoker.alternative_android_sdk_dep ]
} else {
deps += [ "//third_party/android_tools:android_sdk_java" ]
}
if (defined(invoker.shared_resources_whitelist_target)) {
_whitelist_gen_dir =
get_label_info(invoker.shared_resources_whitelist_target,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment