diff options
| author | Jiyong Park <jiyong@google.com> | 2019-07-25 04:38:02 +0000 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-07-25 04:38:02 +0000 |
| commit | f0f7ca8335cca669dd524b39d52997c28eb59e48 (patch) | |
| tree | a6241f1fd17dddb480539d99d7842cc462db2016 /java/hiddenapi_singleton.go | |
| parent | aa53324ac8308d974435cf2c8566835b87e3e05d (diff) | |
Revert "Split Java libraries per apex"
This reverts commit aa53324ac8308d974435cf2c8566835b87e3e05d.
Reason for revert: b/138337109 (broke ndk build)
Change-Id: I9497cb4337add3f8c491a684bcaadea3bdbfaa85
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 8379f5397..c83dda143 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -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) } } |