Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
// Copyright 2019 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package sdk
|
|
|
|
|
|
|
|
import (
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
2019-11-04 04:23:40 +01:00
|
|
|
"path/filepath"
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
"strings"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"android/soong/android"
|
|
|
|
"android/soong/apex"
|
|
|
|
"android/soong/cc"
|
|
|
|
"android/soong/java"
|
|
|
|
)
|
|
|
|
|
2019-11-29 21:17:53 +01:00
|
|
|
func testSdkContext(bp string) (*android.TestContext, android.Config) {
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
config := android.TestArchConfig(buildDir, nil)
|
|
|
|
ctx := android.NewTestArchContext()
|
|
|
|
|
|
|
|
// from android package
|
|
|
|
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
|
|
|
|
ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) {
|
|
|
|
ctx.BottomUp("prebuilts", android.PrebuiltMutator).Parallel()
|
|
|
|
})
|
|
|
|
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
|
|
|
ctx.TopDown("prebuilt_select", android.PrebuiltSelectModuleMutator).Parallel()
|
|
|
|
ctx.BottomUp("prebuilt_postdeps", android.PrebuiltPostDepsMutator).Parallel()
|
|
|
|
})
|
|
|
|
|
|
|
|
// from java package
|
2019-11-23 00:25:03 +01:00
|
|
|
ctx.RegisterModuleType("android_app_certificate", java.AndroidAppCertificateFactory)
|
|
|
|
ctx.RegisterModuleType("java_library", java.LibraryFactory)
|
|
|
|
ctx.RegisterModuleType("java_import", java.ImportFactory)
|
|
|
|
ctx.RegisterModuleType("droidstubs", java.DroidstubsFactory)
|
|
|
|
ctx.RegisterModuleType("prebuilt_stubs_sources", java.PrebuiltStubsSourcesFactory)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
|
|
|
|
// from cc package
|
2019-11-23 00:25:03 +01:00
|
|
|
ctx.RegisterModuleType("cc_library", cc.LibraryFactory)
|
|
|
|
ctx.RegisterModuleType("cc_library_shared", cc.LibrarySharedFactory)
|
|
|
|
ctx.RegisterModuleType("cc_object", cc.ObjectFactory)
|
|
|
|
ctx.RegisterModuleType("cc_prebuilt_library_shared", cc.PrebuiltSharedLibraryFactory)
|
|
|
|
ctx.RegisterModuleType("cc_prebuilt_library_static", cc.PrebuiltStaticLibraryFactory)
|
|
|
|
ctx.RegisterModuleType("llndk_library", cc.LlndkLibraryFactory)
|
|
|
|
ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
2019-11-19 01:00:16 +01:00
|
|
|
ctx.BottomUp("image", android.ImageMutator).Parallel()
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
ctx.BottomUp("link", cc.LinkageMutator).Parallel()
|
|
|
|
ctx.BottomUp("vndk", cc.VndkMutator).Parallel()
|
|
|
|
ctx.BottomUp("test_per_src", cc.TestPerSrcMutator).Parallel()
|
|
|
|
ctx.BottomUp("version", cc.VersionMutator).Parallel()
|
|
|
|
ctx.BottomUp("begin", cc.BeginMutator).Parallel()
|
|
|
|
})
|
|
|
|
|
|
|
|
// from apex package
|
2019-11-23 00:25:03 +01:00
|
|
|
ctx.RegisterModuleType("apex", apex.BundleFactory)
|
|
|
|
ctx.RegisterModuleType("apex_key", apex.ApexKeyFactory)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
ctx.PostDepsMutators(apex.RegisterPostDepsMutators)
|
|
|
|
|
|
|
|
// from this package
|
2019-11-23 00:25:03 +01:00
|
|
|
ctx.RegisterModuleType("sdk", ModuleFactory)
|
|
|
|
ctx.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
ctx.PreDepsMutators(RegisterPreDepsMutators)
|
|
|
|
ctx.PostDepsMutators(RegisterPostDepsMutators)
|
|
|
|
|
|
|
|
ctx.Register()
|
|
|
|
|
|
|
|
bp = bp + `
|
|
|
|
apex_key {
|
|
|
|
name: "myapex.key",
|
|
|
|
public_key: "myapex.avbpubkey",
|
|
|
|
private_key: "myapex.pem",
|
|
|
|
}
|
|
|
|
|
|
|
|
android_app_certificate {
|
|
|
|
name: "myapex.cert",
|
|
|
|
certificate: "myapex",
|
|
|
|
}
|
|
|
|
` + cc.GatherRequiredDepsForTest(android.Android)
|
|
|
|
|
|
|
|
ctx.MockFileSystem(map[string][]byte{
|
|
|
|
"Android.bp": []byte(bp),
|
|
|
|
"build/make/target/product/security": nil,
|
|
|
|
"apex_manifest.json": nil,
|
|
|
|
"system/sepolicy/apex/myapex-file_contexts": nil,
|
|
|
|
"system/sepolicy/apex/myapex2-file_contexts": nil,
|
|
|
|
"myapex.avbpubkey": nil,
|
|
|
|
"myapex.pem": nil,
|
|
|
|
"myapex.x509.pem": nil,
|
|
|
|
"myapex.pk8": nil,
|
|
|
|
"Test.java": nil,
|
|
|
|
"Test.cpp": nil,
|
2019-11-04 04:23:40 +01:00
|
|
|
"include/Test.h": nil,
|
|
|
|
"aidl/foo/bar/Test.aidl": nil,
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
"libfoo.so": nil,
|
2019-11-12 20:39:36 +01:00
|
|
|
"stubs-sources/foo/bar/Foo.java": nil,
|
|
|
|
"foo/bar/Foo.java": nil,
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
})
|
|
|
|
|
|
|
|
return ctx, config
|
|
|
|
}
|
|
|
|
|
|
|
|
func testSdk(t *testing.T, bp string) (*android.TestContext, android.Config) {
|
2019-11-29 21:17:53 +01:00
|
|
|
ctx, config := testSdkContext(bp)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
return ctx, config
|
|
|
|
}
|
|
|
|
|
2019-10-15 08:20:07 +02:00
|
|
|
func testSdkError(t *testing.T, pattern, bp string) {
|
|
|
|
t.Helper()
|
2019-11-29 21:17:53 +01:00
|
|
|
ctx, config := testSdkContext(bp)
|
2019-10-15 08:20:07 +02:00
|
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
|
|
|
if len(errs) > 0 {
|
|
|
|
android.FailIfNoMatchingErrors(t, pattern, errs)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
if len(errs) > 0 {
|
|
|
|
android.FailIfNoMatchingErrors(t, pattern, errs)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
t.Fatalf("missing expected error %q (0 errors are returned)", pattern)
|
|
|
|
}
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
func ensureListContains(t *testing.T, result []string, expected string) {
|
|
|
|
t.Helper()
|
|
|
|
if !android.InList(expected, result) {
|
|
|
|
t.Errorf("%q is not found in %v", expected, result)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func pathsToStrings(paths android.Paths) []string {
|
2019-11-29 21:17:53 +01:00
|
|
|
var ret []string
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
for _, p := range paths {
|
|
|
|
ret = append(ret, p.String())
|
|
|
|
}
|
|
|
|
return ret
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestBasicSdkWithJava(t *testing.T) {
|
|
|
|
ctx, _ := testSdk(t, `
|
|
|
|
sdk {
|
2019-10-11 07:59:13 +02:00
|
|
|
name: "mysdk",
|
2019-11-28 15:31:38 +01:00
|
|
|
java_libs: ["myjavalib"],
|
2019-10-11 07:59:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@1",
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
java_libs: ["sdkmember_mysdk_1"],
|
|
|
|
}
|
|
|
|
|
2019-10-11 07:59:13 +02:00
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@2",
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
java_libs: ["sdkmember_mysdk_2"],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "sdkmember",
|
|
|
|
prefer: false,
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "sdkmember_mysdk_1",
|
|
|
|
sdk_member_name: "sdkmember",
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "sdkmember_mysdk_2",
|
|
|
|
sdk_member_name: "sdkmember",
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
java_library {
|
|
|
|
name: "myjavalib",
|
|
|
|
srcs: ["Test.java"],
|
|
|
|
libs: ["sdkmember"],
|
|
|
|
system_modules: "none",
|
|
|
|
sdk_version: "none",
|
|
|
|
compile_dex: true,
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
apex {
|
|
|
|
name: "myapex",
|
|
|
|
java_libs: ["myjavalib"],
|
2019-10-11 07:59:13 +02:00
|
|
|
uses_sdks: ["mysdk@1"],
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
key: "myapex.key",
|
|
|
|
certificate: ":myapex.cert",
|
|
|
|
}
|
|
|
|
|
|
|
|
apex {
|
|
|
|
name: "myapex2",
|
|
|
|
java_libs: ["myjavalib"],
|
2019-10-11 07:59:13 +02:00
|
|
|
uses_sdks: ["mysdk@2"],
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
key: "myapex.key",
|
|
|
|
certificate: ":myapex.cert",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
sdkMemberV1 := ctx.ModuleForTests("sdkmember_mysdk_1", "android_common_myapex").Rule("combineJar").Output
|
|
|
|
sdkMemberV2 := ctx.ModuleForTests("sdkmember_mysdk_2", "android_common_myapex2").Rule("combineJar").Output
|
|
|
|
|
|
|
|
javalibForMyApex := ctx.ModuleForTests("myjavalib", "android_common_myapex")
|
|
|
|
javalibForMyApex2 := ctx.ModuleForTests("myjavalib", "android_common_myapex2")
|
|
|
|
|
|
|
|
// Depending on the uses_sdks value, different libs are linked
|
|
|
|
ensureListContains(t, pathsToStrings(javalibForMyApex.Rule("javac").Implicits), sdkMemberV1.String())
|
|
|
|
ensureListContains(t, pathsToStrings(javalibForMyApex2.Rule("javac").Implicits), sdkMemberV2.String())
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestBasicSdkWithCc(t *testing.T) {
|
|
|
|
ctx, _ := testSdk(t, `
|
|
|
|
sdk {
|
2019-10-11 07:59:13 +02:00
|
|
|
name: "mysdk",
|
|
|
|
native_shared_libs: ["sdkmember"],
|
|
|
|
}
|
|
|
|
|
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@1",
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
native_shared_libs: ["sdkmember_mysdk_1"],
|
|
|
|
}
|
|
|
|
|
2019-10-11 07:59:13 +02:00
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@2",
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
native_shared_libs: ["sdkmember_mysdk_2"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "sdkmember",
|
|
|
|
srcs: ["libfoo.so"],
|
|
|
|
prefer: false,
|
|
|
|
system_shared_libs: [],
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "sdkmember_mysdk_1",
|
|
|
|
sdk_member_name: "sdkmember",
|
|
|
|
srcs: ["libfoo.so"],
|
|
|
|
system_shared_libs: [],
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "sdkmember_mysdk_2",
|
|
|
|
sdk_member_name: "sdkmember",
|
|
|
|
srcs: ["libfoo.so"],
|
|
|
|
system_shared_libs: [],
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "mycpplib",
|
|
|
|
srcs: ["Test.cpp"],
|
|
|
|
shared_libs: ["sdkmember"],
|
|
|
|
system_shared_libs: [],
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
apex {
|
|
|
|
name: "myapex",
|
|
|
|
native_shared_libs: ["mycpplib"],
|
2019-10-11 07:59:13 +02:00
|
|
|
uses_sdks: ["mysdk@1"],
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
key: "myapex.key",
|
|
|
|
certificate: ":myapex.cert",
|
|
|
|
}
|
|
|
|
|
|
|
|
apex {
|
|
|
|
name: "myapex2",
|
|
|
|
native_shared_libs: ["mycpplib"],
|
2019-10-11 07:59:13 +02:00
|
|
|
uses_sdks: ["mysdk@2"],
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
key: "myapex.key",
|
|
|
|
certificate: ":myapex.cert",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
sdkMemberV1 := ctx.ModuleForTests("sdkmember_mysdk_1", "android_arm64_armv8-a_core_shared_myapex").Rule("toc").Output
|
|
|
|
sdkMemberV2 := ctx.ModuleForTests("sdkmember_mysdk_2", "android_arm64_armv8-a_core_shared_myapex2").Rule("toc").Output
|
|
|
|
|
|
|
|
cpplibForMyApex := ctx.ModuleForTests("mycpplib", "android_arm64_armv8-a_core_shared_myapex")
|
|
|
|
cpplibForMyApex2 := ctx.ModuleForTests("mycpplib", "android_arm64_armv8-a_core_shared_myapex2")
|
|
|
|
|
|
|
|
// Depending on the uses_sdks value, different libs are linked
|
|
|
|
ensureListContains(t, pathsToStrings(cpplibForMyApex.Rule("ld").Implicits), sdkMemberV1.String())
|
|
|
|
ensureListContains(t, pathsToStrings(cpplibForMyApex2.Rule("ld").Implicits), sdkMemberV2.String())
|
|
|
|
}
|
|
|
|
|
2019-11-12 20:39:36 +01:00
|
|
|
// Note: This test does not verify that a droidstubs can be referenced, either
|
|
|
|
// directly or indirectly from an APEX as droidstubs can never be a part of an
|
|
|
|
// apex.
|
|
|
|
func TestBasicSdkWithDroidstubs(t *testing.T) {
|
|
|
|
testSdk(t, `
|
|
|
|
sdk {
|
|
|
|
name: "mysdk",
|
|
|
|
stubs_sources: ["mystub"],
|
|
|
|
}
|
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@10",
|
|
|
|
stubs_sources: ["mystub_mysdk@10"],
|
|
|
|
}
|
|
|
|
prebuilt_stubs_sources {
|
|
|
|
name: "mystub_mysdk@10",
|
|
|
|
sdk_member_name: "mystub",
|
|
|
|
srcs: ["stubs-sources/foo/bar/Foo.java"],
|
|
|
|
}
|
|
|
|
droidstubs {
|
|
|
|
name: "mystub",
|
|
|
|
srcs: ["foo/bar/Foo.java"],
|
|
|
|
sdk_version: "none",
|
|
|
|
system_modules: "none",
|
|
|
|
}
|
|
|
|
java_library {
|
|
|
|
name: "myjavalib",
|
|
|
|
srcs: [":mystub"],
|
|
|
|
sdk_version: "none",
|
|
|
|
system_modules: "none",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2019-10-15 08:20:07 +02:00
|
|
|
func TestDepNotInRequiredSdks(t *testing.T) {
|
|
|
|
testSdkError(t, `module "myjavalib".*depends on "otherlib".*that isn't part of the required SDKs:.*`, `
|
|
|
|
sdk {
|
|
|
|
name: "mysdk",
|
|
|
|
java_libs: ["sdkmember"],
|
|
|
|
}
|
|
|
|
|
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@1",
|
|
|
|
java_libs: ["sdkmember_mysdk_1"],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "sdkmember",
|
|
|
|
prefer: false,
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "sdkmember_mysdk_1",
|
|
|
|
sdk_member_name: "sdkmember",
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
java_library {
|
|
|
|
name: "myjavalib",
|
|
|
|
srcs: ["Test.java"],
|
|
|
|
libs: [
|
|
|
|
"sdkmember",
|
|
|
|
"otherlib",
|
|
|
|
],
|
|
|
|
system_modules: "none",
|
|
|
|
sdk_version: "none",
|
|
|
|
compile_dex: true,
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
// this lib is no in mysdk
|
|
|
|
java_library {
|
|
|
|
name: "otherlib",
|
|
|
|
srcs: ["Test.java"],
|
|
|
|
system_modules: "none",
|
|
|
|
sdk_version: "none",
|
|
|
|
compile_dex: true,
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
apex {
|
|
|
|
name: "myapex",
|
|
|
|
java_libs: ["myjavalib"],
|
|
|
|
uses_sdks: ["mysdk@1"],
|
|
|
|
key: "myapex.key",
|
|
|
|
certificate: ":myapex.cert",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2019-11-06 08:03:32 +01:00
|
|
|
func TestSdkIsCompileMultilibBoth(t *testing.T) {
|
|
|
|
ctx, _ := testSdk(t, `
|
|
|
|
sdk {
|
|
|
|
name: "mysdk",
|
|
|
|
native_shared_libs: ["sdkmember"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "sdkmember",
|
|
|
|
srcs: ["Test.cpp"],
|
|
|
|
system_shared_libs: [],
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
armOutput := ctx.ModuleForTests("sdkmember", "android_arm_armv7-a-neon_core_shared").Module().(*cc.Module).OutputFile()
|
|
|
|
arm64Output := ctx.ModuleForTests("sdkmember", "android_arm64_armv8-a_core_shared").Module().(*cc.Module).OutputFile()
|
|
|
|
|
|
|
|
var inputs []string
|
|
|
|
buildParams := ctx.ModuleForTests("mysdk", "android_common").Module().BuildParamsForTests()
|
|
|
|
for _, bp := range buildParams {
|
2019-11-04 04:23:40 +01:00
|
|
|
if bp.Input != nil {
|
|
|
|
inputs = append(inputs, bp.Input.String())
|
|
|
|
}
|
2019-11-06 08:03:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// ensure that both 32/64 outputs are inputs of the sdk snapshot
|
|
|
|
ensureListContains(t, inputs, armOutput.String())
|
|
|
|
ensureListContains(t, inputs, arm64Output.String())
|
|
|
|
}
|
|
|
|
|
2019-11-04 04:23:40 +01:00
|
|
|
func TestSnapshot(t *testing.T) {
|
|
|
|
ctx, config := testSdk(t, `
|
|
|
|
sdk {
|
|
|
|
name: "mysdk",
|
|
|
|
java_libs: ["myjavalib"],
|
|
|
|
native_shared_libs: ["mynativelib"],
|
2019-11-12 20:39:36 +01:00
|
|
|
stubs_sources: ["myjavaapistubs"],
|
2019-11-04 04:23:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
java_library {
|
|
|
|
name: "myjavalib",
|
|
|
|
srcs: ["Test.java"],
|
|
|
|
aidl: {
|
|
|
|
export_include_dirs: ["aidl"],
|
|
|
|
},
|
|
|
|
system_modules: "none",
|
|
|
|
sdk_version: "none",
|
|
|
|
compile_dex: true,
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "mynativelib",
|
|
|
|
srcs: [
|
|
|
|
"Test.cpp",
|
|
|
|
"aidl/foo/bar/Test.aidl",
|
|
|
|
],
|
|
|
|
export_include_dirs: ["include"],
|
|
|
|
aidl: {
|
|
|
|
export_aidl_headers: true,
|
|
|
|
},
|
|
|
|
system_shared_libs: [],
|
|
|
|
stl: "none",
|
|
|
|
}
|
2019-11-12 20:39:36 +01:00
|
|
|
|
|
|
|
droidstubs {
|
|
|
|
name: "myjavaapistubs",
|
|
|
|
srcs: ["foo/bar/Foo.java"],
|
|
|
|
system_modules: "none",
|
|
|
|
sdk_version: "none",
|
|
|
|
}
|
2019-11-04 04:23:40 +01:00
|
|
|
`)
|
|
|
|
|
2019-11-26 19:02:20 +01:00
|
|
|
sdk := ctx.ModuleForTests("mysdk", "android_common").Module().(*sdk)
|
|
|
|
|
|
|
|
checkSnapshotAndroidBpContents(t, sdk, `// This is auto-generated. DO NOT EDIT.
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "mysdk_myjavalib@current",
|
|
|
|
sdk_member_name: "myjavalib",
|
|
|
|
jars: ["java/myjavalib.jar"],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "myjavalib",
|
|
|
|
prefer: false,
|
|
|
|
jars: ["java/myjavalib.jar"],
|
|
|
|
}
|
|
|
|
|
|
|
|
prebuilt_stubs_sources {
|
|
|
|
name: "mysdk_myjavaapistubs@current",
|
|
|
|
sdk_member_name: "myjavaapistubs",
|
|
|
|
srcs: ["java/myjavaapistubs_stubs_sources"],
|
|
|
|
}
|
|
|
|
|
|
|
|
prebuilt_stubs_sources {
|
|
|
|
name: "myjavaapistubs",
|
|
|
|
prefer: false,
|
2019-11-26 22:55:37 +01:00
|
|
|
srcs: ["java/myjavaapistubs_stubs_sources"],
|
2019-11-26 19:02:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "mysdk_mynativelib@current",
|
|
|
|
sdk_member_name: "mynativelib",
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
srcs: ["arm64/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"arm64/include/include",
|
|
|
|
"arm64/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
arm: {
|
|
|
|
srcs: ["arm/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"arm/include/include",
|
|
|
|
"arm/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "mynativelib",
|
|
|
|
prefer: false,
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
srcs: ["arm64/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"arm64/include/include",
|
|
|
|
"arm64/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
arm: {
|
|
|
|
srcs: ["arm/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"arm/include/include",
|
|
|
|
"arm/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
}
|
|
|
|
|
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@current",
|
2019-11-27 18:43:54 +01:00
|
|
|
java_libs: ["mysdk_myjavalib@current"],
|
|
|
|
stubs_sources: ["mysdk_myjavaapistubs@current"],
|
|
|
|
native_shared_libs: ["mysdk_mynativelib@current"],
|
2019-11-26 19:02:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
`)
|
|
|
|
|
2019-11-04 04:23:40 +01:00
|
|
|
var copySrcs []string
|
|
|
|
var copyDests []string
|
2019-11-26 19:02:20 +01:00
|
|
|
buildParams := sdk.BuildParamsForTests()
|
2019-11-29 21:17:53 +01:00
|
|
|
var mergeZipInputs []string
|
|
|
|
var intermediateZip string
|
|
|
|
var outputZip string
|
2019-11-04 04:23:40 +01:00
|
|
|
for _, bp := range buildParams {
|
2019-11-12 20:39:36 +01:00
|
|
|
ruleString := bp.Rule.String()
|
2019-11-29 21:17:53 +01:00
|
|
|
if ruleString == android.Cp.String() {
|
2019-11-04 04:23:40 +01:00
|
|
|
copySrcs = append(copySrcs, bp.Input.String())
|
|
|
|
copyDests = append(copyDests, bp.Output.Rel()) // rooted at the snapshot root
|
2019-11-29 21:17:53 +01:00
|
|
|
} else if ruleString == zipFiles.String() {
|
|
|
|
intermediateZip = bp.Output.String()
|
|
|
|
} else if ruleString == mergeZips.String() {
|
|
|
|
input := bp.Input.String()
|
|
|
|
if intermediateZip != input {
|
|
|
|
t.Errorf("Intermediate zip %s is not an input to merge_zips, %s is used instead", intermediateZip, input)
|
|
|
|
}
|
|
|
|
mergeZipInputs = bp.Inputs.Strings()
|
|
|
|
outputZip = bp.Output.String()
|
2019-11-04 04:23:40 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
buildDir := config.BuildDir()
|
|
|
|
ensureListContains(t, copySrcs, "aidl/foo/bar/Test.aidl")
|
|
|
|
ensureListContains(t, copySrcs, "include/Test.h")
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/android_arm64_armv8-a_core_shared/gen/aidl/aidl/foo/bar/BnTest.h"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/android_arm64_armv8-a_core_shared/gen/aidl/aidl/foo/bar/BpTest.h"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/android_arm64_armv8-a_core_shared/gen/aidl/aidl/foo/bar/Test.h"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/myjavalib/android_common/turbine-combined/myjavalib.jar"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/android_arm64_armv8-a_core_shared/mynativelib.so"))
|
|
|
|
|
|
|
|
ensureListContains(t, copyDests, "aidl/aidl/foo/bar/Test.aidl")
|
|
|
|
ensureListContains(t, copyDests, "arm64/include/include/Test.h")
|
|
|
|
ensureListContains(t, copyDests, "arm64/include_gen/mynativelib/aidl/foo/bar/BnTest.h")
|
|
|
|
ensureListContains(t, copyDests, "arm64/include_gen/mynativelib/aidl/foo/bar/BpTest.h")
|
|
|
|
ensureListContains(t, copyDests, "arm64/include_gen/mynativelib/aidl/foo/bar/Test.h")
|
|
|
|
ensureListContains(t, copyDests, "java/myjavalib.jar")
|
|
|
|
ensureListContains(t, copyDests, "arm64/lib/mynativelib.so")
|
2019-11-12 20:39:36 +01:00
|
|
|
|
2019-11-29 21:17:53 +01:00
|
|
|
expectedOutputZip := filepath.Join(buildDir, ".intermediates/mysdk/android_common/mysdk-current.zip")
|
|
|
|
expectedRepackagedZip := filepath.Join(buildDir, ".intermediates/mysdk/android_common/tmp/java/myjavaapistubs_stubs_sources.zip")
|
|
|
|
|
2019-11-12 20:39:36 +01:00
|
|
|
// Ensure that the droidstubs .srcjar as repackaged into a temporary zip file
|
|
|
|
// and then merged together with the intermediate snapshot zip.
|
2019-11-29 21:17:53 +01:00
|
|
|
ensureListContains(t, mergeZipInputs, expectedRepackagedZip)
|
|
|
|
if outputZip != expectedOutputZip {
|
|
|
|
t.Errorf("Expected snapshot output to be %q but was %q", expectedOutputZip, outputZip)
|
2019-11-12 20:39:36 +01:00
|
|
|
}
|
2019-11-04 04:23:40 +01:00
|
|
|
}
|
|
|
|
|
2019-11-26 19:04:12 +01:00
|
|
|
func TestHostSnapshot(t *testing.T) {
|
2019-12-03 16:40:55 +01:00
|
|
|
// b/145598135 - Generating host snapshots for anything other than linux is not supported.
|
|
|
|
SkipIfNotLinux(t)
|
|
|
|
|
2019-11-26 19:04:12 +01:00
|
|
|
ctx, config := testSdk(t, `
|
|
|
|
sdk {
|
|
|
|
name: "mysdk",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
java_libs: ["myjavalib"],
|
|
|
|
native_shared_libs: ["mynativelib"],
|
|
|
|
stubs_sources: ["myjavaapistubs"],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_library {
|
|
|
|
name: "myjavalib",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
srcs: ["Test.java"],
|
|
|
|
aidl: {
|
|
|
|
export_include_dirs: ["aidl"],
|
|
|
|
},
|
|
|
|
system_modules: "none",
|
|
|
|
sdk_version: "none",
|
|
|
|
compile_dex: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "mynativelib",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
srcs: [
|
|
|
|
"Test.cpp",
|
|
|
|
"aidl/foo/bar/Test.aidl",
|
|
|
|
],
|
|
|
|
export_include_dirs: ["include"],
|
|
|
|
aidl: {
|
|
|
|
export_aidl_headers: true,
|
|
|
|
},
|
|
|
|
system_shared_libs: [],
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
droidstubs {
|
|
|
|
name: "myjavaapistubs",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
srcs: ["foo/bar/Foo.java"],
|
|
|
|
system_modules: "none",
|
|
|
|
sdk_version: "none",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
sdk := ctx.ModuleForTests("mysdk", "linux_glibc_common").Module().(*sdk)
|
|
|
|
|
|
|
|
checkSnapshotAndroidBpContents(t, sdk, `// This is auto-generated. DO NOT EDIT.
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "mysdk_myjavalib@current",
|
|
|
|
sdk_member_name: "myjavalib",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
jars: ["java/myjavalib.jar"],
|
|
|
|
}
|
|
|
|
|
|
|
|
java_import {
|
|
|
|
name: "myjavalib",
|
|
|
|
prefer: false,
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
jars: ["java/myjavalib.jar"],
|
|
|
|
}
|
|
|
|
|
|
|
|
prebuilt_stubs_sources {
|
|
|
|
name: "mysdk_myjavaapistubs@current",
|
|
|
|
sdk_member_name: "myjavaapistubs",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
srcs: ["java/myjavaapistubs_stubs_sources"],
|
|
|
|
}
|
|
|
|
|
|
|
|
prebuilt_stubs_sources {
|
|
|
|
name: "myjavaapistubs",
|
|
|
|
prefer: false,
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
srcs: ["java/myjavaapistubs_stubs_sources"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "mysdk_mynativelib@current",
|
|
|
|
sdk_member_name: "mynativelib",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
arch: {
|
|
|
|
x86_64: {
|
|
|
|
srcs: ["x86_64/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"x86_64/include/include",
|
|
|
|
"x86_64/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
x86: {
|
|
|
|
srcs: ["x86/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"x86/include/include",
|
|
|
|
"x86/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "mynativelib",
|
|
|
|
prefer: false,
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
arch: {
|
|
|
|
x86_64: {
|
|
|
|
srcs: ["x86_64/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"x86_64/include/include",
|
|
|
|
"x86_64/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
x86: {
|
|
|
|
srcs: ["x86/lib/mynativelib.so"],
|
|
|
|
export_include_dirs: [
|
|
|
|
"x86/include/include",
|
|
|
|
"x86/include_gen/mynativelib",
|
|
|
|
],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
}
|
|
|
|
|
|
|
|
sdk_snapshot {
|
|
|
|
name: "mysdk@current",
|
|
|
|
device_supported: false,
|
|
|
|
host_supported: true,
|
|
|
|
java_libs: ["mysdk_myjavalib@current"],
|
|
|
|
stubs_sources: ["mysdk_myjavaapistubs@current"],
|
|
|
|
native_shared_libs: ["mysdk_mynativelib@current"],
|
|
|
|
}
|
|
|
|
|
|
|
|
`)
|
|
|
|
|
|
|
|
var copySrcs []string
|
|
|
|
var copyDests []string
|
|
|
|
buildParams := sdk.BuildParamsForTests()
|
2019-11-29 21:17:53 +01:00
|
|
|
var mergeZipInputs []string
|
|
|
|
var intermediateZip string
|
|
|
|
var outputZip string
|
2019-11-26 19:04:12 +01:00
|
|
|
for _, bp := range buildParams {
|
|
|
|
ruleString := bp.Rule.String()
|
2019-11-29 21:17:53 +01:00
|
|
|
if ruleString == android.Cp.String() {
|
2019-11-26 19:04:12 +01:00
|
|
|
copySrcs = append(copySrcs, bp.Input.String())
|
|
|
|
copyDests = append(copyDests, bp.Output.Rel()) // rooted at the snapshot root
|
2019-11-29 21:17:53 +01:00
|
|
|
} else if ruleString == zipFiles.String() {
|
|
|
|
intermediateZip = bp.Output.String()
|
|
|
|
} else if ruleString == mergeZips.String() {
|
|
|
|
input := bp.Input.String()
|
|
|
|
if intermediateZip != input {
|
|
|
|
t.Errorf("Intermediate zip %s is not an input to merge_zips, %s is used instead", intermediateZip, input)
|
|
|
|
}
|
|
|
|
mergeZipInputs = bp.Inputs.Strings()
|
|
|
|
outputZip = bp.Output.String()
|
2019-11-26 19:04:12 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
buildDir := config.BuildDir()
|
|
|
|
ensureListContains(t, copySrcs, "aidl/foo/bar/Test.aidl")
|
|
|
|
ensureListContains(t, copySrcs, "include/Test.h")
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/linux_glibc_x86_64_shared/gen/aidl/aidl/foo/bar/BnTest.h"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/linux_glibc_x86_64_shared/gen/aidl/aidl/foo/bar/BpTest.h"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/linux_glibc_x86_64_shared/gen/aidl/aidl/foo/bar/Test.h"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/myjavalib/linux_glibc_common/javac/myjavalib.jar"))
|
|
|
|
ensureListContains(t, copySrcs, filepath.Join(buildDir, ".intermediates/mynativelib/linux_glibc_x86_64_shared/mynativelib.so"))
|
|
|
|
|
|
|
|
ensureListContains(t, copyDests, "aidl/aidl/foo/bar/Test.aidl")
|
|
|
|
ensureListContains(t, copyDests, "x86_64/include/include/Test.h")
|
|
|
|
ensureListContains(t, copyDests, "x86_64/include_gen/mynativelib/aidl/foo/bar/BnTest.h")
|
|
|
|
ensureListContains(t, copyDests, "x86_64/include_gen/mynativelib/aidl/foo/bar/BpTest.h")
|
|
|
|
ensureListContains(t, copyDests, "x86_64/include_gen/mynativelib/aidl/foo/bar/Test.h")
|
|
|
|
ensureListContains(t, copyDests, "java/myjavalib.jar")
|
|
|
|
ensureListContains(t, copyDests, "x86_64/lib/mynativelib.so")
|
|
|
|
|
2019-11-29 21:17:53 +01:00
|
|
|
expectedOutputZip := filepath.Join(buildDir, ".intermediates/mysdk/linux_glibc_common/mysdk-current.zip")
|
|
|
|
expectedRepackagedZip := filepath.Join(buildDir, ".intermediates/mysdk/linux_glibc_common/tmp/java/myjavaapistubs_stubs_sources.zip")
|
|
|
|
|
2019-11-26 19:04:12 +01:00
|
|
|
// Ensure that the droidstubs .srcjar as repackaged into a temporary zip file
|
|
|
|
// and then merged together with the intermediate snapshot zip.
|
2019-11-29 21:17:53 +01:00
|
|
|
ensureListContains(t, mergeZipInputs, expectedRepackagedZip)
|
|
|
|
if outputZip != expectedOutputZip {
|
|
|
|
t.Errorf("Expected snapshot output to be %q but was %q", expectedOutputZip, outputZip)
|
2019-11-26 19:04:12 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-26 19:02:20 +01:00
|
|
|
func checkSnapshotAndroidBpContents(t *testing.T, s *sdk, expectedContents string) {
|
|
|
|
t.Helper()
|
|
|
|
androidBpContents := strings.NewReplacer("\\n", "\n").Replace(s.GetAndroidBpContentsForTests())
|
|
|
|
if androidBpContents != expectedContents {
|
|
|
|
t.Errorf("Android.bp contents do not match, expected %s, actual %s", expectedContents, androidBpContents)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
var buildDir string
|
|
|
|
|
|
|
|
func setUp() {
|
|
|
|
var err error
|
|
|
|
buildDir, err = ioutil.TempDir("", "soong_sdk_test")
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func tearDown() {
|
2019-11-29 21:17:53 +01:00
|
|
|
_ = os.RemoveAll(buildDir)
|
Introduce module type 'sdk'
This change introduces a new module type named 'sdk'. It is a logical
group of prebuilt modules that together provide a context (e.g. APIs)
in which Mainline modules (such as APEXes) are built.
A prebuilt module (e.g. java_import) can join an sdk by adding it to the
sdk module as shown below:
sdk {
name: "mysdk#20",
java_libs: ["myjavalib_mysdk_20"],
}
java_import {
name: "myjavalib_mysdk_20",
srcs: ["myjavalib-v20.jar"],
sdk_member_name: "myjavalib",
}
sdk {
name: "mysdk#21",
java_libs: ["myjavalib_mysdk_21"],
}
java_import {
name: "myjavalib_mysdk_21",
srcs: ["myjavalib-v21.jar"],
sdk_member_name: "myjavalib",
}
java_library {
name: "myjavalib",
srcs: ["**/*/*.java"],
}
An APEX can specify the SDK(s) that it wants to build with via the new
'uses_sdks' property.
apex {
name: "myapex",
java_libs: ["libX", "libY"],
uses_sdks: ["mysdk#20"],
}
With this, libX, libY, and their transitive dependencies are all built
with the version 20 of myjavalib (the first java_import module) instead
of the other one (which is for version 21) and java_library having the
same name (which is for ToT).
Bug: 138182343
Test: m (sdk_test.go added)
Change-Id: I7e14c524a7d6a0d9f575fb20822080f39818c01e
2019-07-17 13:08:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestMain(m *testing.M) {
|
|
|
|
run := func() int {
|
|
|
|
setUp()
|
|
|
|
defer tearDown()
|
|
|
|
|
|
|
|
return m.Run()
|
|
|
|
}
|
|
|
|
|
|
|
|
os.Exit(run())
|
|
|
|
}
|
2019-12-03 16:40:55 +01:00
|
|
|
|
|
|
|
func SkipIfNotLinux(t *testing.T) {
|
|
|
|
t.Helper()
|
|
|
|
if android.BuildOs != android.Linux {
|
|
|
|
t.Skipf("Skipping as sdk snapshot generation is only supported on %s not %s", android.Linux, android.BuildOs)
|
|
|
|
}
|
|
|
|
}
|