Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07c88569 authored by Colin Cross's avatar Colin Cross
Browse files

Delay invalid sdk_version error for AllowMissingDependencies 

Unbundled builds set AllowMissingDependencies and attempt to use
prebuilts for some jars.  Delay the errors for missing jars for
modules with invalid sdk_version values in unbundled builds so
that they only block the build if those modules are built.

Also fix some error messages to show the original sdk_version
value.

Bug: 146513037
Test: m TARGET_BUILD_APPS=Camera2
Change-Id: I1812ef6dc80895f7a2162a8bdbf2c5067755e9a0
parent 99d522b5

java/sdk.go

+2 −2
Original line number Diff line number Diff line
@@ -127,12 +127,12 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep 
		}



		if !jarPath.Valid() {

			ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, jar)

			ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", sdk, jar)

			return sdkDep{}

		}



		if !aidlPath.Valid() {

			ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, aidl)

			ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", sdk, aidl)

			return sdkDep{}

		}

java/sdk_library.go

+5 −1
Original line number Diff line number Diff line
@@ -667,7 +667,11 @@ func (module *SdkLibrary) PrebuiltJars(ctx android.BaseModuleContext, sdkVersion 
	jar := filepath.Join(dir, module.BaseModuleName()+".jar")

	jarPath := android.ExistentPathForSource(ctx, jar)

	if !jarPath.Valid() {

		ctx.PropertyErrorf("sdk_library", "invalid sdk version %q, %q does not exist", v, jar)

		if ctx.Config().AllowMissingDependencies() {

			return android.Paths{android.PathForSource(ctx, jar)}

		} else {

			ctx.PropertyErrorf("sdk_library", "invalid sdk version %q, %q does not exist", sdkVersion, jar)

		}

		return nil

	}

	return android.Paths{jarPath.Path()}