mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-28 11:27:32 +09:00
[aom] No longer necessary to run lint_config.sh anymore
Upstream can now code generate the rtcd interface files directly from the aom_config.h header, so we no longer have to generate an intermediate file by running lint_config.sh. This also means we can remove the code for creating a temporary directory.
This commit is contained in:
parent
e731bff61e
commit
8493557d20
2 changed files with 4 additions and 146 deletions
|
|
@ -25,14 +25,6 @@ function write_license {
|
|||
echo "" >> $1
|
||||
}
|
||||
|
||||
# Print the configuration.
|
||||
# $1 - Header file directory.
|
||||
function print_config {
|
||||
$BASE_DIR/lint_config.sh -p \
|
||||
-h $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_config.h \
|
||||
-a $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_config.asm
|
||||
}
|
||||
|
||||
# Generate *_rtcd.h files.
|
||||
# $1 - Header file directory.
|
||||
# $2 - Architecture.
|
||||
|
|
@ -40,34 +32,28 @@ function print_config {
|
|||
function gen_rtcd_header {
|
||||
echo "Generate $LIBAOM_CONFIG_DIR/$1/*_rtcd.h files."
|
||||
|
||||
rm -rf $TEMP_DIR/libaom.config
|
||||
$BASE_DIR/lint_config.sh -p \
|
||||
-h $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_config.h \
|
||||
-a $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_config.asm \
|
||||
-o $TEMP_DIR/libaom.config
|
||||
AOM_CONFIG=$BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_config.h
|
||||
|
||||
$BASE_DIR/$LIBAOM_SRC_DIR/build/make/rtcd.pl \
|
||||
--arch=$2 \
|
||||
--sym=aom_rtcd $3 \
|
||||
--config=$TEMP_DIR/libaom.config \
|
||||
--config=$AOM_CONFIG \
|
||||
$BASE_DIR/$LIBAOM_SRC_DIR/av1/common/av1_rtcd_defs.pl \
|
||||
> $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/av1_rtcd.h
|
||||
|
||||
$BASE_DIR/$LIBAOM_SRC_DIR/build/make/rtcd.pl \
|
||||
--arch=$2 \
|
||||
--sym=aom_scale_rtcd $3 \
|
||||
--config=$TEMP_DIR/libaom.config \
|
||||
--config=$AOM_CONFIG \
|
||||
$BASE_DIR/$LIBAOM_SRC_DIR/aom_scale/aom_scale_rtcd.pl \
|
||||
> $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_scale_rtcd.h
|
||||
|
||||
$BASE_DIR/$LIBAOM_SRC_DIR/build/make/rtcd.pl \
|
||||
--arch=$2 \
|
||||
--sym=aom_dsp_rtcd $3 \
|
||||
--config=$TEMP_DIR/libaom.config \
|
||||
--config=$AOM_CONFIG \
|
||||
$BASE_DIR/$LIBAOM_SRC_DIR/aom_dsp/aom_dsp_rtcd_defs.pl \
|
||||
> $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_dsp_rtcd.h
|
||||
|
||||
rm -rf $TEMP_DIR/libaom.config
|
||||
}
|
||||
|
||||
echo "Generating config files."
|
||||
|
|
@ -77,15 +63,6 @@ python generate_sources_mozbuild.py
|
|||
# Copy aom_version.h once. The file is the same for all platforms.
|
||||
cp aom_version.h $BASE_DIR/$LIBAOM_CONFIG_DIR
|
||||
|
||||
echo "Remove temporary directory."
|
||||
rm -rf $TEMP_DIR
|
||||
|
||||
echo "Create temporary directory."
|
||||
TEMP_DIR="$BASE_DIR/.temp"
|
||||
rm -rf $TEMP_DIR
|
||||
cp -R $LIBAOM_SRC_DIR $TEMP_DIR
|
||||
cd $TEMP_DIR
|
||||
|
||||
gen_rtcd_header linux/x64 x86_64
|
||||
gen_rtcd_header linux/ia32 x86
|
||||
gen_rtcd_header mac/x64 x86_64
|
||||
|
|
@ -98,10 +75,6 @@ gen_rtcd_header linux/arm armv7
|
|||
|
||||
gen_rtcd_header generic generic
|
||||
|
||||
echo "Remove temporary directory."
|
||||
cd $BASE_DIR
|
||||
rm -rf $TEMP_DIR
|
||||
|
||||
cd $BASE_DIR/$LIBAOM_SRC_DIR
|
||||
|
||||
cd $BASE_DIR
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue