commit 69612672981550394ce1fbcec8ec4af0b864e43f
author Ulya Trafimovich <skvadrik@google.com> Tue Oct 20 17:41:54 2020 +0100
committer Ulya Trafimovich <skvadrik@google.com> Thu Oct 29 17:47:34 2020 +0000
tree 799f197efadebf6c3eb57aa3f030d3e776548257
parent ccc8c85a7cec14dff7b9be31a17750e6b018c916

Add unit tests for class loader context.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I96a1e6cef86652e429b1678a655fc0b02f40d00c

dexpreopt/dexpreopt.go

diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go
index 51d1157..a07f1fa 100644
--- a/dexpreopt/dexpreopt.go
+++ b/dexpreopt/dexpreopt.go
@@ -81,7 +81,9 @@
 	}
 
 	if !dexpreoptDisabled(ctx, global, module) {
-		if clc := genClassLoaderContext(ctx, global, module); clc != nil {
+		if clc, err := genClassLoaderContext(ctx, global, module); err != nil {
+			android.ReportPathErrorf(ctx, err.Error())
+		} else if clc != nil {
 			appImage := (generateProfile || module.ForceCreateAppImage || global.DefaultAppImages) &&
 				!module.NoCreateAppImage