1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8240535: Add additional linux-aarch64 jib profiles

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Mikael Vidstedt 2020-03-06 17:33:07 -08:00
parent 9f334a1640
commit c203cebcdf
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
make/conf/jib-profiles.js
View File

@ -466,8 +466,7 @@ var getJibProfilesProfiles = function (input, common, data) {
build_cpu: "x64", build_cpu: "x64",
dependencies: ["devkit", "build_devkit", "cups"], dependencies: ["devkit", "build_devkit", "cups"],
configure_args: [ configure_args: [
"--openjdk-target=aarch64-linux-gnu", "--with-freetype=bundled", "--openjdk-target=aarch64-linux-gnu",
"--disable-warnings-as-errors"
], ],
}, },
@ -539,7 +538,7 @@ var getJibProfilesProfiles = function (input, common, data) {
}); });
// Generate -gcov profiles // Generate -gcov profiles
[ "linux-x64", "macosx-x64" ].forEach(function (name) { [ "linux-aarch64", "linux-x64", "macosx-x64" ].forEach(function (name) {
var gcovName = name + "-gcov"; var gcovName = name + "-gcov";
profiles[gcovName] = clone(profiles[name]); profiles[gcovName] = clone(profiles[name]);
profiles[gcovName].default_make_targets = ["product-bundles", "test-bundles"]; profiles[gcovName].default_make_targets = ["product-bundles", "test-bundles"];
@ -626,7 +625,7 @@ var getJibProfilesProfiles = function (input, common, data) {
}); });
// JCov profiles build JCov-instrumented JDK image based on images provided through dependencies. // JCov profiles build JCov-instrumented JDK image based on images provided through dependencies.
[ "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"] [ "linux-aarch64", "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
.forEach(function (name) { .forEach(function (name) {
var jcovName = name + "-jcov"; var jcovName = name + "-jcov";
profiles[jcovName] = clone(common.main_profile_base); profiles[jcovName] = clone(common.main_profile_base);
@ -783,7 +782,7 @@ var getJibProfilesProfiles = function (input, common, data) {
}); });
// Artifacts of JCov profiles // Artifacts of JCov profiles
[ "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"] [ "linux-aarch64", "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
.forEach(function (name) { .forEach(function (name) {
var o = artifactData[name] var o = artifactData[name]
var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version); var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
@ -803,7 +802,7 @@ var getJibProfilesProfiles = function (input, common, data) {
}); });
// Artifacts of gcov (native-code-coverage) profiles // Artifacts of gcov (native-code-coverage) profiles
[ "linux-x64", "macosx-x64" ].forEach(function (name) { [ "linux-aarch64", "linux-x64", "macosx-x64" ].forEach(function (name) {
var o = artifactData[name] var o = artifactData[name]
var pf = o.platform var pf = o.platform
var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version); var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);