diff --git a/.gitignore b/.gitignore index 931ce07a..3ff06992 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ proprietary/* prebuilt/archive +prebuilt/generated/* +!prebuilt/generated/Android.bp diff --git a/config/Android.mk b/config/Android.mk deleted file mode 100644 index 90ce7831..00000000 --- a/config/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# 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/config/common.mk b/config/common.mk index 2901a029..73828d66 100644 --- a/config/common.mk +++ b/config/common.mk @@ -127,7 +127,7 @@ PRODUCT_PACKAGES += \ # Build Manifest PRODUCT_PACKAGES += \ - build-manifest + build-manifest.xml # Lineage packages ifeq ($(PRODUCT_IS_ATV),) diff --git a/prebuilt/generated/Android.bp b/prebuilt/generated/Android.bp new file mode 100644 index 00000000..c7f45cae --- /dev/null +++ b/prebuilt/generated/Android.bp @@ -0,0 +1,10 @@ +// +// SPDX-FileCopyrightText: The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "build-manifest.xml", + src: "build-manifest.xml", + product_specific: true, +} diff --git a/vendorsetup.sh b/vendorsetup.sh new file mode 100755 index 00000000..b0a9022f --- /dev/null +++ b/vendorsetup.sh @@ -0,0 +1,4 @@ +#!/bin/bash -e + +echo "- Generating vendor/lineage/prebuilt/generated/build-manifest.xml" +python3 .repo/repo/repo manifest -o - -r | grep -Ev "proprietary_${MANIFEST_EXCLUDES}" > vendor/lineage/prebuilt/generated/build-manifest.xml