Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9599479 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Generate system diff between KATI and SOONG" into main

parents f3fa5d5b 8376b32e

core/Makefile

+18 −0
Original line number Diff line number Diff line
@@ -3557,6 +3557,24 @@ define build-systemimage-target 
endef



$(eval $(call write-partition-file-list,$(systemimage_intermediates)/file_list.txt,$(TARGET_OUT),$(FULL_SYSTEMIMAGE_DEPS)))



ifneq ($(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE),)

file_list_diff := $(HOST_OUT_EXECUTABLES)/file_list_diff$(HOST_EXECUTABLE_SUFFIX)

system_file_diff_timestamp := $(systemimage_intermediates)/file_diff.timestamp



$(system_file_diff_timestamp): \

	    $(systemimage_intermediates)/file_list.txt \

	    $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_FILELIST) \

	    $(ALL_MODULES.system_image_diff_allowlist.INSTALLED) \

	    $(file_list_diff)

	$(file_list_diff) $(systemimage_intermediates)/file_list.txt \

	  $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_FILELIST) \

	  $(ALL_MODULES.system_image_diff_allowlist.INSTALLED) $(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE)

	touch $@



$(BUILT_SYSTEMIMAGE): $(system_file_diff_timestamp)

endif



# Used by soong sandwich to request the staging dir be built

$(systemimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT)/%,$(FULL_SYSTEMIMAGE_DEPS))

	touch $@

core/base_rules.mk

+5 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,11 @@ ifdef LOCAL_ACONFIG_FILES 
      $(ALL_MODULES.$(my_register_name).ACONFIG_FILES) $(LOCAL_ACONFIG_FILES)

endif



ifdef LOCAL_FILESYSTEM_FILELIST

  ALL_MODULES.$(my_register_name).FILESYSTEM_FILELIST := \

      $(ALL_MODULES.$(my_register_name).FILESYSTEM_FILELIST) $(LOCAL_FILESYSTEM_FILELIST)

endif



ifndef LOCAL_SOONG_MODULE_INFO_JSON

  ALL_MAKE_MODULE_INFO_JSON_MODULES += $(my_register_name)

  ALL_MODULES.$(my_register_name).SHARED_LIBS := \

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ LOCAL_EXPORT_STATIC_LIBRARY_HEADERS:= 
LOCAL_EXTRA_FULL_TEST_CONFIGS:=

LOCAL_EXTRACT_APK:=

LOCAL_EXTRACT_DPI_APK:=

LOCAL_FILESYSTEM_FILELIST:=

LOCAL_FINDBUGS_FLAGS:=

LOCAL_FORCE_STATIC_EXECUTABLE:=

LOCAL_FULL_CLASSES_JACOCO_JAR:=

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -495,6 +495,9 @@ _product_single_value_vars += PRODUCT_16K_DEVELOPER_OPTION 
# by this flag.

_product_single_value_vars += PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG



# If set, build would generate system image from Soong-defined module.

_product_single_value_vars += PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE



.KATI_READONLY := _product_single_value_vars _product_list_vars

_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

tools/filelistdiff/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
// Copyright (C) 2024 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.



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



python_binary_host {

    name: "file_list_diff",

    srcs: ["file_list_diff.py"],

}



prebuilt_etc_host {

    name: "system_image_diff_allowlist",

    src: "allowlist",

}