Fix multiple output file generation for AAPT2
Make R.stamp actually part of the same rule that creates R.java.
Otherwise if the generated sources directory is removed, we don't
regenerate R.java / Manifest.java.
Also move the package-export.apk and proguard options file into the same
rule.
Test: m telephony-common; rm out/target/common/obj/*/*_intermediates/src; m telephony-common
Change-Id: I71f6fcaf20593ca23271d52d15537aaa9ef4cc77
diff --git a/core/package_internal.mk b/core/package_internal.mk
index 7d9c7d4..fe648c2 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -419,7 +419,7 @@
@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"
@rm -rf $@ && mkdir -p $(dir $@)
$(create-resource-java-files)
- $(call find-generated-R.java)
+ $(call find-generated-R.java,$@)
$(proguard_options_file): $(R_file_stamp)