Commit 03667272 authored by Michael Thiessen's avatar Michael Thiessen Committed by Commit Bot

Reland "Exclude unused java classes from gvr_common_java aar"

This reverts commit f04d3bde.

Original change's description:
> Revert "Exclude unused java classes from gvr_common_java aar"
> 
> This reverts commit dbc48ca4.
> 
> Reason for revert: Getting NoClassDefFoundError on Nougat https://chromium-swarm.appspot.com/task?id=3c01bdd86290b710&refresh=10&show_raw=1
> 
> Original change's description:
> > Exclude unused java classes from gvr_common_java aar
> > 
> > As far as I can tell this filters the rest of the unused java classes.
> > 
> > Please revert this CL if you see ClassNotFound Exceptions.
> > 
> > diagnose_bloat summary:
> > MonochromePublic.apk_Breakdown (-4,097 bytes)
> >     +1,731 bytes Zip Overhead
> >         -1 bytes Package metadata size
> >     -5,827 bytes Java code size
> > MonochromePublic.apk_Specifics
> >    -15,137 bytes normalized apk size
> >    -11,040 bytes main dex size
> > 
> > Bug: 944791
> > Change-Id: I53219489d0289655a72405ab1e06cbeeb065d4f4
> > Reviewed-on: https://chromium-review.googlesource.com/944791
> > Reviewed-by: Brandon Jones <bajones@chromium.org>
> > Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#540549}
> 
> TBR=mthiesse@chromium.org,bajones@chromium.org
> 
> Change-Id: I1b4b8c2d4acaaa9eafde507ceeb32293a164ac2b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 944791
> Reviewed-on: https://chromium-review.googlesource.com/946653
> Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
> Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#540672}

TBR=mthiesse@chromium.org,bajones@chromium.org,bsheedy@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 944791
Change-Id: I17e5095e0298d20bdd3876473e673f4ed5f07e5c
Reviewed-on: https://chromium-review.googlesource.com/951826
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541236}
parent 967d1121
......@@ -33,6 +33,7 @@ android_aar_prebuilt("gvr_common_java") {
"*google/vr/cardboard/DisplaySynchronizer.class",
"*google/vr/cardboard/DisplayUtils.class",
"*google/vr/cardboard/FrameMonitor.class",
"*google/vr/cardboard/IsEmulator.class",
"*google/vr/cardboard/PackageUtils.class",
"*google/vr/cardboard/VrContextWrapper.class",
"*google/vr/cardboard/VrCoreLibraryLoader.class",
......@@ -40,9 +41,9 @@ android_aar_prebuilt("gvr_common_java") {
"*google/vr/cardboard/VrParamsProviderFactory.class",
"*google/vr/cardboard/VrParamsProviderFactory\$ContentProviderClientHandle.class",
"*google/vr/cardboard/VrSettingsProviderContract.class",
# TODO(mthiesse): Figure out whether all files in this directory are needed.
"*google/vr/internal/controller/*",
"*google/vr/internal/controller/ControllerServiceBridge.class",
"*google/vr/internal/controller/ControllerServiceBridge\$*",
"*google/vr/internal/controller/NativeCallbacks.class",
"*google/vr/ndk/base/AndroidCompat.class",
"*google/vr/ndk/base/BuildConstants.class",
"*google/vr/ndk/base/DaydreamApi*.class",
......@@ -55,23 +56,25 @@ android_aar_prebuilt("gvr_common_java") {
"*google/vr/ndk/base/SdkConfigurationReader.class",
"*google/vr/ndk/base/TraceCompat.class",
"*google/vr/ndk/base/Version.class",
# TODO(mthiesse): Figure out whether all files in this directory are needed.
"*google/vr/sdk/common/deps/*",
# TODO(mthiesse): Figure out whether all files in this directory are needed.
"*google/vr/sdk/proto/nano/*",
# TODO(mthiesse): Figure out whether all files in this directory are needed.
"*google/vr/vrcore/base/api/*",
# TODO(mthiesse): Figure out whether all files in this directory are needed.
"*google/vr/vrcore/common/api/*",
# TODO(mthiesse): Figure out whether all files in this directory are needed.
"*google/vr/vrcore/controller/api/*",
# TODO(mthiesse): Figure out whether all files in this directory are needed.
"*google/vr/sdk/common/deps/a.class",
"*google/vr/sdk/common/deps/b.class",
"*google/vr/sdk/common/deps/c.class",
"*google/vr/sdk/proto/nano/CardboardDevice.class",
"*google/vr/sdk/proto/nano/CardboardDevice\$*",
"*google/vr/sdk/proto/nano/Display.class",
"*google/vr/sdk/proto/nano/Display\$*",
"*google/vr/sdk/proto/nano/SdkConfiguration.class",
"*google/vr/sdk/proto/nano/SdkConfiguration\$*",
"*google/vr/vrcore/base/api/ParcelableProto.class",
"*google/vr/vrcore/base/api/VrCoreConstants.class",
"*google/vr/vrcore/base/api/VrCoreNotAvailableException.class",
"*google/vr/vrcore/base/api/VrCoreUtils.class",
"*google/vr/vrcore/base/api/VrCoreUtils\$*",
"*google/vr/vrcore/common/api/IDaydream*",
"*google/vr/vrcore/common/api/ITransition*",
"*google/vr/vrcore/common/api/IVrCore*",
"*google/vr/vrcore/controller/api/IController*",
"*google/vr/vrcore/controller/api/Controller*",
"*google/vr/vrcore/library/api/*",
]
......
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