From 5a7defdab15434bebd5d1026e350b29bc3a946d4 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Thu, 25 Jun 2020 09:42:09 +0100 Subject: [PATCH] Move construct_context.sh from Make to Soong. 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 --- core/OWNERS | 1 - core/construct_context.sh | 78 --------------------------------------- 2 files changed, 79 deletions(-) delete mode 100755 core/construct_context.sh diff --git a/core/OWNERS b/core/OWNERS index 750f1fa20..459683e85 100644 --- a/core/OWNERS +++ b/core/OWNERS @@ -1,3 +1,2 @@ per-file dex_preopt*.mk = ngeoffray@google.com,calin@google.com,mathewi@google.com,dbrazdil@google.com -per-file construct_context.sh = ngeoffray@google.com,calin@google.com,mathieuc@google.com per-file verify_uses_libraries.sh = ngeoffray@google.com,calin@google.com,mathieuc@google.com diff --git a/core/construct_context.sh b/core/construct_context.sh deleted file mode 100755 index d620d0846..000000000 --- a/core/construct_context.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/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}}"