From fbdff8b806617a1e51acec7e500a577332350159 Mon Sep 17 00:00:00 2001 From: Anders Dellien Date: Tue, 8 Feb 2022 14:17:46 +0000 Subject: [PATCH 1/2] Remove obsolete patch This patch is not needed for Android S Signed-off-by: Anders Dellien --- ...lowed_deps.txt-to-avoid-build-errors.patch | 32 ------------------- tc/vendorsetup.sh | 1 - 2 files changed, 33 deletions(-) delete mode 100644 tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch diff --git a/tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch b/tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch deleted file mode 100644 index 35e53a6..0000000 --- a/tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4675de8ef8f42df61dfdc06e678dec825c0f5c49 Mon Sep 17 00:00:00 2001 -From: Anders Dellien -Date: Thu, 15 Jul 2021 17:34:27 +0100 -Subject: [PATCH] Update allowed_deps.txt to avoid build errors - ---- - build/allowed_deps.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt -index 47331ca..f2594c6 100644 ---- a/build/allowed_deps.txt -+++ b/build/allowed_deps.txt -@@ -245,6 +245,7 @@ libbacktrace_headers(minSdkVersion:apex_inherit) - libbase(minSdkVersion:29) - libbase_headers(minSdkVersion:29) - libbase_ndk(minSdkVersion:29) -+libbinder(minSdkVersion:29) - libbinder_headers(minSdkVersion:29) - libbinder_headers_platform_shared(minSdkVersion:29) - libbinderthreadstateutils(minSdkVersion:29) -@@ -414,6 +415,7 @@ libstagefright_amrwbdec(minSdkVersion:29) - libstagefright_amrwbenc(minSdkVersion:29) - libstagefright_bufferpool@2.0.1(minSdkVersion:29) - libstagefright_bufferqueue_helper(minSdkVersion:29) -+libstagefright_bufferqueue_helper_novndk(minSdkVersion:(no version)) - libstagefright_bufferqueue_helper_novndk(minSdkVersion:29) - libstagefright_enc_common(minSdkVersion:29) - libstagefright_esds(minSdkVersion:29) --- -2.17.1 - diff --git a/tc/vendorsetup.sh b/tc/vendorsetup.sh index 7fcaf99..fac02e5 100644 --- a/tc/vendorsetup.sh +++ b/tc/vendorsetup.sh @@ -34,4 +34,3 @@ ANDROID_TOP_DIR=$(pwd) PATCHES_DIR=$ANDROID_TOP_DIR/device/arm/tc/patches apply_patch "external/drm_hwcomposer" "0001-Add-include-of-fcntl.h.patch" -apply_patch "packages/modules/common" "0001-Update-allowed_deps.txt-to-avoid-build-errors.patch" -- GitLab From e7f6f5809359a85e532f7f1df654aa2c1b61e687 Mon Sep 17 00:00:00 2001 From: Anders Dellien Date: Tue, 8 Feb 2022 14:20:56 +0000 Subject: [PATCH 2/2] Remove 'nano' profile Signed-off-by: Anders Dellien --- tc/AndroidProducts.mk | 2 -- tc/BoardConfig-partitions.mk | 6 ---- tc/nano_art_minimal.mk | 28 ------------------- tc/nano_core.mk | 54 ------------------------------------ tc/tc_nano.mk | 32 --------------------- tc/tc_nano/BoardConfig.mk | 17 ------------ tc/tc_nano/init.tc_nano.rc | 25 ----------------- 7 files changed, 164 deletions(-) delete mode 100644 tc/nano_art_minimal.mk delete mode 100644 tc/nano_core.mk delete mode 100644 tc/tc_nano.mk delete mode 100644 tc/tc_nano/BoardConfig.mk delete mode 100644 tc/tc_nano/init.tc_nano.rc diff --git a/tc/AndroidProducts.mk b/tc/AndroidProducts.mk index 6a2b274..40bda5d 100644 --- a/tc/AndroidProducts.mk +++ b/tc/AndroidProducts.mk @@ -15,9 +15,7 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/tc_nano.mk \ $(LOCAL_DIR)/tc_swr.mk COMMON_LUNCH_CHOICES := \ - tc_nano-eng \ tc_swr-eng diff --git a/tc/BoardConfig-partitions.mk b/tc/BoardConfig-partitions.mk index 20da458..43aa93f 100644 --- a/tc/BoardConfig-partitions.mk +++ b/tc/BoardConfig-partitions.mk @@ -30,14 +30,8 @@ BOARD_USES_RECOVERY_AS_BOOT := false BOARD_USES_OEMIMAGE := true BOARD_OEMIMAGE_FILE_SYSTEM_TYPE := ext4 -# Choose smaller partition sizes for nanodroid builds. -ifeq (,$(filter %_nano, $(TARGET_PRODUCT))) BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280 # 1.25 GB BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 # 550 MB -else -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 209715200 # 200 MB -BOARD_USERDATAIMAGE_PARTITION_SIZE := 83886080 # 80 MB -endif # Boot image is only built in user and userdebug modes, In these modes, # the kernel Image is copied to device profile and used to build the boot image. diff --git a/tc/nano_art_minimal.mk b/tc/nano_art_minimal.mk deleted file mode 100644 index a284a44..0000000 --- a/tc/nano_art_minimal.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# 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. -# - -# A drastically stripped down version of build/target/product/runtime_libart.mk, -# providing the bare minimum for running simple Java programs with ART. - -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - dalvik.vm.image-dex2oat-Xms=64m \ - dalvik.vm.image-dex2oat-Xmx=64m \ - dalvik.vm.dex2oat-Xms=64m \ - dalvik.vm.dex2oat-Xmx=512m \ - ro.dalvik.vm.native.bridge=0 \ - dalvik.vm.usejit=true \ - dalvik.vm.usejitprofiles=true \ - dalvik.vm.appimageformat=lz4 diff --git a/tc/nano_core.mk b/tc/nano_core.mk deleted file mode 100644 index 2f07ad6..0000000 --- a/tc/nano_core.mk +++ /dev/null @@ -1,54 +0,0 @@ -# -# 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. -# - -# This is based on build/target/product/embedded.mk, with an even smaller -# set of dependencies. - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/init.common.rc:root/init.common.rc \ - $(LOCAL_PATH)/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc - -$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) - -PRODUCT_PACKAGES += \ - com.android.runtime \ - crash_dump \ - gdbserver \ - grep \ - init_vendor \ - ip \ - ping \ - selinux_policy_nonsystem \ - -# Required host packages -PRODUCT_HOST_PACKAGES += \ - fastboot - -# Set a default PRODUCT_BRAND (like in build/target/product/core_tiny.mk for -# instance). -PRODUCT_BRAND := nano - -# The default setting is to support 32-bit apps only. -TARGET_SUPPORTS_64_BIT_APPS := true - -# Never build test modules, as they pull a huge number of dependencies. -ANDROID_NO_TEST_CHECK := true - -# Don't use the precollected boot image profile for generating boot image -PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := false - -# The check would fail because there are no boot jars. -SKIP_BOOT_JARS_CHECK ?= true diff --git a/tc/tc_nano.mk b/tc/tc_nano.mk deleted file mode 100644 index fe1ded7..0000000 --- a/tc/tc_nano.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (C) 2020 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. -# - -$(call inherit-product, device/generic/goldfish/minimal_system.mk) -$(call inherit-product, $(LOCAL_PATH)/nano_core.mk) -$(call inherit-product, $(LOCAL_PATH)/nano_art_minimal.mk) -$(call inherit-product, $(LOCAL_PATH)/device.mk) - -PRODUCT_NAME := tc_nano -PRODUCT_MANUFACTURER := Arm -PRODUCT_DEVICE := tc_nano -PRODUCT_MODEL := Total Compute Fast Model (Nano build) - -OVERRIDE_TARGET_FLATTEN_APEX := true - -MULTILIB_BUILD := true - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/tc_nano/init.tc_nano.rc:root/init.total_compute.rc \ No newline at end of file diff --git a/tc/tc_nano/BoardConfig.mk b/tc/tc_nano/BoardConfig.mk deleted file mode 100644 index 824ab40..0000000 --- a/tc/tc_nano/BoardConfig.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2019 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. -# - -include device/arm/tc/BoardConfig_common.mk diff --git a/tc/tc_nano/init.tc_nano.rc b/tc/tc_nano/init.tc_nano.rc deleted file mode 100644 index ae0dc96..0000000 --- a/tc/tc_nano/init.tc_nano.rc +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) 2020 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. -# - -import /init.common.rc - -on boot - # The Android network stack is not included in Nano, so we need to - # configure the network manually. The configuration below is the same as - # would be obtained from the fast model's emulated DHCP. - exec u:r:shell:s0 -- /system/bin/ip address add 172.20.51.1/24 broadcast 172.20.51.255 dev eth0 - exec u:r:shell:s0 -- /system/bin/ip route add default via 172.20.51.254 - ifup eth0 -- GitLab