Revert "Split Java libraries per apex"

This reverts commit aa53324ac8.

Reason for revert: b/138337109 (broke ndk build)

Change-Id: I9497cb4337add3f8c491a684bcaadea3bdbfaa85
This commit is contained in:
Jiyong Park
2019-07-25 04:38:02 +00:00
parent aa53324ac8
commit f0f7ca8335
4 changed files with 3 additions and 63 deletions

View File

@@ -152,14 +152,6 @@ func stubFlagsRule(ctx android.SingletonContext) {
// Collect dex jar paths for modules that had hiddenapi encode called on them.
if h, ok := module.(hiddenAPIIntf); ok {
if jar := h.bootDexJar(); jar != nil {
// For a java lib included in an APEX, only take the one built for
// the platform variant, and skip the variants for APEXes.
// Otherwise, the hiddenapi tool will complain about duplicated classes
if a, ok := module.(android.ApexModule); ok {
if android.InAnyApex(module.Name()) && !a.IsForPlatform() {
return
}
}
bootDexJars = append(bootDexJars, jar)
}
}