064b70c918
Dexpreopt and boot jars package check all require access to dex implementation jars created for java_library and java_sdk_library. They were available when building from source but not when building from prebuilts, even though they are embedded within the .apex files that are referenced from prebuilt_apex. This changes adds support to prebuilt_apex to export the dex implementation jars and updates java_import to use those exported dex implementation jars. In a source build dexpreopt/boot jars package check access the apex (or platform) specific variant of a java_library, e.g. core-oj, from which it retrieves the dex implementation jar path. After this change in a prebuilt build dexpreopt/boot jars package check behave in the same way except in this case they retrieve the dex implementation jar path from the apex (or platform) specific variant of the java_import, e.g. core-oj. The work to export files from a `.apex` file for use by other modules is performed by a new `deapexer` module type. It is not used directly in an `Android.bp` file but instead is created implicitly by `prebuilt_apex`, In order to do that this contains the following changes: * Adds a new `dexapexer` module type to handle the exporting of files from the `.apex` file. * Adds an exported_java_libs property to prebuilt_apex to specify the set of libraries whose dex implementation jars need exporting. * Creates apex specific variants of the libraries listed in the exported_java_libs property. * Adds the set of exported files to the ApexInfo to make them available to the apex specific variants. * Prevents the prebuilt_apex variants from being merged together as they will not be compatible. * Modifies java_import to use the exported file for variants of a prebuilt_apex. * Adds a ninja rule to unpack (using deapexer) the contents of the prebuilt_apex's apex file, verify that the required files are present and make them available as outputs for other rules to use. * Some minor refactorings to support these changes. * Adds tests to cover prebuilt only, prebuilt with source preferred, and prebuilt preferred with source. Test: m nothing Bug: 171061220 Change-Id: Ic9bed81fb65b92f0d59f64c0bce168a9ed44cfac
59 lines
1.7 KiB
Bash
Executable file
59 lines
1.7 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
set -eu
|
|
|
|
# Copyright 2020 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.
|
|
|
|
# Tool to unpack an apex file and verify that the required files were extracted.
|
|
if [ $# -lt 5 ]; then
|
|
echo "usage: $0 <deapaxer_path> <debugfs_path> <apex file> <output_dir> <required_files>+" >&2
|
|
exit 1
|
|
fi
|
|
|
|
DEAPEXER_PATH=$1
|
|
DEBUGFS_PATH=$2
|
|
APEX_FILE=$3
|
|
OUTPUT_DIR=$4
|
|
shift 4
|
|
REQUIRED_PATHS=$@
|
|
|
|
set -x 1
|
|
|
|
rm -fr $OUTPUT_DIR
|
|
mkdir -p $OUTPUT_DIR
|
|
|
|
# Unpack the apex file contents.
|
|
$DEAPEXER_PATH --debugfs_path $DEBUGFS_PATH extract $APEX_FILE $OUTPUT_DIR
|
|
|
|
# Verify that the files that the build expects to be in the .apex file actually
|
|
# exist, and make sure they have a fresh mtime to not confuse ninja.
|
|
typeset -i FAILED=0
|
|
for r in $REQUIRED_PATHS; do
|
|
if [ ! -f $r ]; then
|
|
echo "Required file $r not present in apex $APEX_FILE" >&2
|
|
FAILED=$FAILED+1
|
|
else
|
|
# TODO(http:/b/177646343) - deapexer extracts the files with a timestamp of 1 Jan 1970.
|
|
# touch the file so that ninja knows it has changed.
|
|
touch $r
|
|
fi
|
|
done
|
|
|
|
if [ $FAILED -gt 0 ]; then
|
|
echo "$FAILED required files were missing from $APEX_FILE" >&2
|
|
echo "Available files are:" >&2
|
|
find $OUTPUT_DIR -type f | sed "s|^| |" >&2
|
|
exit 1
|
|
fi
|