Commit Graph

5 Commits

Author SHA1 Message Date
Colin Cross
db522fc75c Revert "Revert "Fix manifest merging flags""
This reverts commit b0c795d78b.

Reason for revert: SystemUITests fixed in b/112587252
Bug: 112587252
Bug: 112467584

Change-Id: Ie00c1923cb5f17c76ce6ff0528b1f729fdabc4f2
2018-08-14 20:03:38 +00:00
Colin Cross
b0c795d78b Revert "Fix manifest merging flags"
This reverts commit b7c147efec.

Reason for revert: broke SystemUI tests
Bug: 112587252
Bug: 112467584

Change-Id: I0d442e40d22ff9b04b1bb618a68a7d04c20e376b
2018-08-14 19:25:26 +00:00
Jason Monk
b7c147efec Fix manifest merging flags
library manifests were just being dropped on the ground.

Bug: 112467584
Test: build
Change-Id: I61c2efca37aa3fdb9c944260f4a276d1d3c26f6c
2018-08-10 11:27:21 -07:00
Colin Cross
1b6a3cfea4 Set targetSdkVersion in manifest_fixer
If targetSdkVersion is not set in the manifest, set it to the
value it was implicitly using before changing minSdkVersion.
Requires passing --library to manifest_fixer.py to distinguish
between apps, where the implicit value was set by aapt2 to
current, or libraries where the implicit value was 1.
Fixes cases where the manifest does not specify targetSdkVersion
and was inheriting the minSdkVersion value until manifest merger
started merging a lower targetSdkVersion value from a library.

Bug: 111347801
Test: manifest_fixer_test.py
Change-Id: I8fcf0c5f452707565ba1808f6fe552ffed055c47
2018-07-26 11:09:24 -07:00
Colin Cross
31656958d6 Use manifest merger in Soong
Move the manifest merger config to Soong, and use it to merge
manifests of static dependencies of android_library and android_app
modules.

Bug: 110848854
Test: m checkbuild
Change-Id: Ib89e1f1a52a8b76157e4e0348baf42800412df0d
Merged-In: Ib89e1f1a52a8b76157e4e0348baf42800412df0d
Merged-In: I5d055ce63b8371db500f8868fb73ab3604b8c24a
2018-07-11 19:46:38 +00:00