Merge changes Ic6f90eb4,I5c5b8436,If673d482,I98b575b8 into rvc-dev
* changes:
Switch java_sdk_library to use SetDefaultableHook()
Allow extractCommonProperties to return an error
Remove reference to obsolete BuildSnapshot()
Correct order of parameters to AssertDeepEquals
diff --git a/java/app.go b/java/app.go
index 4c4b83c..eac76fd 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1394,6 +1394,8 @@
module.processVariants(ctx)
})
+ module.dexpreopter.isTest = true
+
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
android.InitSingleSourcePrebuiltModule(module, &module.properties, "Apk")