From 5cb30c582057f95d607f004eda06834e60dae8c1 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Thu, 25 Jun 2020 09:38:01 +0100 Subject: [PATCH] Move construct_context.sh from Make to Soong. Update OWNERS list. This script belongs with other manifest-related scripts, and the future plan is to rewrite it in Python and share common functionality with other scripts. Test: lunch aosp_cf_x86_phone-userdebug && m Bug: 132357300 Change-Id: I4b90129e5023ca1a2c818fc160c34b0b7da943ef --- dexpreopt/config.go | 2 +- scripts/OWNERS | 1 + scripts/construct_context.sh | 78 ++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100755 scripts/construct_context.sh diff --git a/dexpreopt/config.go b/dexpreopt/config.go index bc44b2101..4a4e834be 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -383,7 +383,7 @@ func createGlobalSoongConfig(ctx android.ModuleContext) *GlobalSoongConfig { SoongZip: ctx.Config().HostToolPath(ctx, "soong_zip"), Zip2zip: ctx.Config().HostToolPath(ctx, "zip2zip"), ManifestCheck: ctx.Config().HostToolPath(ctx, "manifest_check"), - ConstructContext: android.PathForSource(ctx, "build/make/core/construct_context.sh"), + ConstructContext: android.PathForSource(ctx, "build/soong/scripts/construct_context.sh"), } } diff --git a/scripts/OWNERS b/scripts/OWNERS index dd0966fa5..027455484 100644 --- a/scripts/OWNERS +++ b/scripts/OWNERS @@ -1,3 +1,4 @@ per-file system-clang-format,system-clang-format-2 = enh@google.com,smoreland@google.com per-file build-mainline-modules.sh = ngeoffray@google.com,paulduffin@google.com,mast@google.com per-file build-aml-prebuilts.sh = ngeoffray@google.com,paulduffin@google.com,mast@google.com +per-file construct_context.sh = ngeoffray@google.com,calin@google.com,mathieuc@google.com,skvadrik@google.com diff --git a/scripts/construct_context.sh b/scripts/construct_context.sh new file mode 100755 index 000000000..d620d0846 --- /dev/null +++ b/scripts/construct_context.sh @@ -0,0 +1,78 @@ +#!/bin/bash +# +# Copyright (C) 2018 The Android Open Source Project +# +# 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. + +set -e + +# target_sdk_version: parsed from manifest +# +# outputs +# class_loader_context_arg: final class loader conext arg +# stored_class_loader_context_arg: final stored class loader context arg + +if [ -z "${target_sdk_version}" ]; then + echo "ERROR: target_sdk_version not set" + exit 2 +fi + +# The hidl.manager shared library has a dependency on hidl.base. We'll manually +# add that information to the class loader context if we see those libraries. +hidl_manager="android.hidl.manager-V1.0-java" +hidl_base="android.hidl.base-V1.0-java" + +function add_to_contexts { + for i in $1; do + if [[ -z "${class_loader_context}" ]]; then + export class_loader_context="PCL[$i]" + else + export class_loader_context+="#PCL[$i]" + fi + if [[ $i == *"$hidl_manager"* ]]; then + export class_loader_context+="{PCL[${i/$hidl_manager/$hidl_base}]}" + fi + done + + for i in $2; do + if [[ -z "${stored_class_loader_context}" ]]; then + export stored_class_loader_context="PCL[$i]" + else + export stored_class_loader_context+="#PCL[$i]" + fi + if [[ $i == *"$hidl_manager"* ]]; then + export stored_class_loader_context+="{PCL[${i/$hidl_manager/$hidl_base}]}" + fi + done +} + +# The order below must match what the package manager also computes for +# class loader context. + +if [[ "${target_sdk_version}" -lt "28" ]]; then + add_to_contexts "${conditional_host_libs_28}" "${conditional_target_libs_28}" +fi + +if [[ "${target_sdk_version}" -lt "29" ]]; then + add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}" +fi + +if [[ "${target_sdk_version}" -lt "30" ]]; then + add_to_contexts "${conditional_host_libs_30}" "${conditional_target_libs_30}" +fi + +add_to_contexts "${dex_preopt_host_libraries}" "${dex_preopt_target_libraries}" + +# Generate the actual context string. +export class_loader_context_arg="--class-loader-context=PCL[]{${class_loader_context}}" +export stored_class_loader_context_arg="--stored-class-loader-context=PCL[]{${stored_class_loader_context}}"