diff --git a/.gitignore b/.gitignore index 3ff06992..931ce07a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ proprietary/* prebuilt/archive -prebuilt/generated/* -!prebuilt/generated/Android.bp diff --git a/build/tools/gen_build-manifest.sh b/build/tools/gen_build-manifest.sh deleted file mode 100755 index 43ef3360..00000000 --- a/build/tools/gen_build-manifest.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -e -# -# SPDX-FileCopyrightText: The LineageOS Project -# SPDX-License-Identifier: Apache-2.0 -# - -echo "- Generating vendor/lineage/prebuilt/generated/build-manifest.xml" -if [ "$MANIFEST_EXCLUDES" ]; then MANIFEST_EXCLUDES="|${MANIFEST_EXCLUDES}"; fi -python3 .repo/repo/repo manifest -o - -r | grep -Ev "proprietary_${MANIFEST_EXCLUDES}" > vendor/lineage/prebuilt/generated/build-manifest.xml diff --git a/config/Android.mk b/config/Android.mk new file mode 100644 index 00000000..90ce7831 --- /dev/null +++ b/config/Android.mk @@ -0,0 +1,33 @@ +# Copyright (C) 2023 The LineageOS 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. + +ifdef MANIFEST_EXCLUDES +MANIFEST_EXCLUDES := |$(MANIFEST_EXCLUDES) +endif + +include $(CLEAR_VARS) + +LOCAL_MODULE := build-manifest +LOCAL_MODULE_SUFFIX := .xml +LOCAL_MODULE_CLASS := ETC +LOCAL_PRODUCT_MODULE := true + +_build-manifest_intermediates := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE)) +_build-manifest_xml := $(_build-manifest_intermediates)/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) + +$(_build-manifest_xml): + mkdir -p $(dir $@) + python3 .repo/repo/repo manifest -o - -r | grep -Ev "proprietary_$(MANIFEST_EXCLUDES)" > $@ + +include $(BUILD_SYSTEM)/base_rules.mk diff --git a/prebuilt/generated/Android.bp b/prebuilt/generated/Android.bp deleted file mode 100644 index c7f45cae..00000000 --- a/prebuilt/generated/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -// -// SPDX-FileCopyrightText: The LineageOS Project -// SPDX-License-Identifier: Apache-2.0 -// - -prebuilt_etc { - name: "build-manifest.xml", - src: "build-manifest.xml", - product_specific: true, -}