oxmc
af29205167
The recovery_toolkit/recovery_ui merge broke ninja generation for the whole tree (everything runs at analysis time, even for modules nothing builds). Fixes, in the order the errors surfaced: - BoardConfigSoong.mk: export TW_THEME=landscape_hdpi via the twrpVarsPlugin soong config namespace (RPi 4/5 are 1080p HDMI); libguitwrp's theme selection hard-exits analysis when unset - soong/copy.go: re-anchor runtime.Caller path derivation — the 'bootable' anchor never matches at vendor/pawlet/recovery_ui and the slice paniced; recovery dir is now derived relative to this file - scrypt sources.bp + libpixelflinger: hoist arch.arm.neon.* contents into plain arm blocks — the neon variant was removed in android-16 Soong (NEON is mandatory on armv7-a+) - recovery_ui/Android.bp: port twrp_defaults verbatim from android_vendor_twrp (android-14.1, build/soong) — it never lived in bootable/recovery; pure soong_config machinery, contributes no flags until twrpGlobalVars vars are set - gui/Android.bp: drop libaosprecovery from libguitwrp's shared_libs — the module doesn't exist (TWRP's forked install/*.cpp was never ported) and an undefined dep is analysis-fatal; compile is unaffected (static lib), the gap moves to link time and is documented - recovery_ui/Android.bp: librecovery_ui_pawlet_twrp shared -> static (librecovery_ui_ext absorbs TARGET_RECOVERY_UI_LIB via whole_static_libs) and libpixelflinger_twrp moved to static_libs - scrypt Android.bp + libminuitwrp_defaults.go: rewrite leftover bootable/recovery/* self-referential paths to the new vendor/pawlet locations Requires the libminadbd_headers visibility patch in the patches repo. m nothing now completes for pawlet_rpi4-bp4a-userdebug.
83 lines
2.1 KiB
Plaintext
83 lines
2.1 KiB
Plaintext
// Auto-generated - DO NOT EDIT!
|
|
// To regenerate, edit scrypt.config, then run:
|
|
// ./import_scrypt.sh import /path/to/scrypt-1.1.6.tar.gz
|
|
//
|
|
|
|
//
|
|
// Copyright (C) 2017 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.
|
|
//
|
|
|
|
cc_defaults {
|
|
name: "libscrypttwrp_sources",
|
|
|
|
cflags: [
|
|
"-DHAVE_CONFIG_H",
|
|
"-DUSE_OPENSSL_PBKDF2",
|
|
"-Wall",
|
|
"-Werror",
|
|
"-Wno-implicit-function-declaration",
|
|
"-Wno-unused-variable",
|
|
],
|
|
|
|
export_include_dirs: [
|
|
"lib/crypto",
|
|
],
|
|
|
|
local_include_dirs: [
|
|
"lib/util",
|
|
],
|
|
|
|
srcs: [
|
|
"lib/crypto/crypto_scrypt-ref.c",
|
|
],
|
|
|
|
arch: {
|
|
// android-16 Soong removed the arm.neon variant (NEON is mandatory
|
|
// on armv7-a+), so the NEON sources apply to arm unconditionally.
|
|
arm: {
|
|
srcs: [
|
|
"lib/crypto/crypto_scrypt-neon.c",
|
|
],
|
|
exclude_srcs: [
|
|
"lib/crypto/crypto_scrypt-ref.c",
|
|
],
|
|
},
|
|
arm64: {
|
|
srcs: [
|
|
"lib/crypto/crypto_scrypt-neon.c",
|
|
],
|
|
exclude_srcs: [
|
|
"lib/crypto/crypto_scrypt-ref.c",
|
|
],
|
|
},
|
|
x86: {
|
|
srcs: [
|
|
"lib/crypto/crypto_scrypt-sse.c",
|
|
],
|
|
exclude_srcs: [
|
|
"lib/crypto/crypto_scrypt-ref.c",
|
|
],
|
|
},
|
|
x86_64: {
|
|
srcs: [
|
|
"lib/crypto/crypto_scrypt-sse.c",
|
|
],
|
|
exclude_srcs: [
|
|
"lib/crypto/crypto_scrypt-ref.c",
|
|
],
|
|
},
|
|
},
|
|
}
|