PeterGSI/android_vendor_foss
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: PeterGSI:aosp15
Branches Tags
PeterGSI:aosp15
PeterGSI:aosp16
PeterGSI:aosp14
PeterGSI:aosp13
..
compare: PeterGSI:aosp14
Branches Tags
PeterGSI:aosp15
PeterGSI:aosp16
PeterGSI:aosp14
PeterGSI:aosp13

No commits in common. "aosp15" and "aosp14" have entirely different histories.
aosp15 ... aosp14

1 changed files with 6 additions and 33 deletions
Show stats Expand all files Collapse all files

39
update.sh
View file

@ -1,22 +1,8 @@
#!/bin/bash #!/bin/bash
set -e set -e
PRIVILEGED_APPS=(
"com.google.android.gms"
"com.android.vending"
)
if ! which aapt; then
echo "No aapt binary found; run \`mm aapt\` first"
exit 1
fi
# Always execute in the script's directory # Always execute in the script's directory
pushd "$(dirname "$(realpath "$0")")" pushd "$(dirname "$(realpath "$0")")"
# Clean up all previously generated
rm -rf Android.mk apps.mk bin lib
repo="https://f-droid.org/repo/" repo="https://f-droid.org/repo/"
prebuilt_libs=() prebuilt_libs=()
@ -33,10 +19,6 @@ addPrebuiltJniModules() {
for lib_mod_name in "${prebuilt_libs[@]}"; do for lib_mod_name in "${prebuilt_libs[@]}"; do
lib="$(awk -F'__' '{ print $2 }' <<< "$lib_mod_name")" lib="$(awk -F'__' '{ print $2 }' <<< "$lib_mod_name")"
app_mod="$(awk -F'__' '{ print $1 }' <<< "$lib_mod_name")" app_mod="$(awk -F'__' '{ print $1 }' <<< "$lib_mod_name")"
app_dir="app"
if contains "$app_mod" "${PRIVILEGED_APPS[@]}"; then
app_dir="priv-app"
fi
cat >> Android.mk <<EOF cat >> Android.mk <<EOF
include \$(CLEAR_VARS) include \$(CLEAR_VARS)
LOCAL_MODULE := $lib_mod_name LOCAL_MODULE := $lib_mod_name
@ -50,7 +32,7 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_CHECK_ELF_FILES := false LOCAL_CHECK_ELF_FILES := false
LOCAL_PRODUCT_MODULE := true LOCAL_PRODUCT_MODULE := true
LOCAL_STRIP_MODULE := false LOCAL_STRIP_MODULE := false
LOCAL_MODULE_PATH := \$(TARGET_OUT_PRODUCT)/$app_dir/$app_mod/lib/\$(TARGET_ARCH)/ LOCAL_MODULE_PATH := \$(TARGET_OUT_PRODUCT)/app/$app_mod/lib/\$(TARGET_ARCH)/
include \$(BUILD_PREBUILT) include \$(BUILD_PREBUILT)
EOF EOF
done done
@ -71,20 +53,20 @@ addJNI() {
local_prebuilt_libs+=("${libname}") local_prebuilt_libs+=("${libname}")
done <<< "$(unzip -l -qq bin/$1 'lib/*')" done <<< "$(unzip -l -qq bin/$1 'lib/*')"
if [[ ! -z "$local_prebuilt_libs" ]]; then if [[ ! -z "$local_prebuilt_libs" ]]; then
addition+=$'\n'
addition+="LOCAL_REQUIRED_MODULES := ${local_prebuilt_libs[@]}" addition+="LOCAL_REQUIRED_MODULES := ${local_prebuilt_libs[@]}"
prebuilt_libs+=("${local_prebuilt_libs[@]}") prebuilt_libs+=("${local_prebuilt_libs[@]}")
fi fi
} }
addCopy() { addCopy() {
addition="" addition=""
if contains "$2" "${PRIVILEGED_APPS[@]}"; then if [ "$2" == com.google.android.gms ] || [ "$2" == com.android.vending ] ;then
addition="LOCAL_PRIVILEGED_MODULE := true" addition="LOCAL_PRIVILEGED_MODULE := true"
else
# Only add JNI for non-priv-apps (because addJNI and addPrebuiltJniModules do not support priv-app properly)
addJNI $1 $2
fi fi
addJNI $1 $2
cat >> Android.mk <<EOF cat >> Android.mk <<EOF
include \$(CLEAR_VARS) include \$(CLEAR_VARS)
LOCAL_MODULE := $2 LOCAL_MODULE := $2
@ -184,16 +166,7 @@ downloadFromFdroid com.aurora.store
# Mail client # Mail client
downloadFromFdroid com.fsck.k9 "Email" downloadFromFdroid com.fsck.k9 "Email"
# Gallery
downloadFromFdroid org.fossify.gallery "Photos Gallery Gallery2" downloadFromFdroid org.fossify.gallery "Photos Gallery Gallery2"
# Camera
downloadFromFdroid net.sourceforge.opencamera "Camera Camera2"
# Messages
downloadFromFdroid org.fossify.messages messaging
# Contacts
downloadFromFdroid org.fossify.contacts Contacts
# Clock
downloadFromFdroid com.vicolo.chrono "DeskClock AlarmClock"
downloadFromFdroid com.machiav3lli.fdroid downloadFromFdroid com.machiav3lli.fdroid