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

Commit f1d7ef65 authored by Rob Seymour's avatar Rob Seymour Committed by Automerger Merge Worker
Browse files

Merge "Add APEX data to checkvintf for compatibility check." am: 0a00cd27 

Original change: https://android-review.googlesource.com/c/platform/build/+/2169483



Change-Id: I2a2c59cf65ba2daafe4f406258582d140b7d6562
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ab0ab96 0a00cd27

core/Makefile

+23 −0
Original line number Diff line number Diff line
@@ -4574,6 +4574,26 @@ ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
intermediates := $(call intermediates-dir-for,PACKAGING,check_vintf_all)

check_vintf_all_deps :=



APEX_OUT := $(PRODUCT_OUT)/apex

# -----------------------------------------------------------------

# Create apex-info-file.xsd



APEX_DIRS := \

  $(TARGET_OUT)/apex/% \

  $(TARGET_OUT_SYSTEM_EXT)/apex/% \

  $(TARGET_OUT_VENDOR)/apex/% \

  $(TARGET_OUT_ODM)/apex/% \

  $(TARGET_OUT_PRODUCT)/apex/% \



apex_vintf_files := $(sort $(filter $(APEX_DIRS), $(INTERNAL_ALLIMAGES_FILES)))

APEX_INFO_FILE   := $(APEX_OUT)/apex-info-list.xml



$(APEX_INFO_FILE): $(HOST_OUT_EXECUTABLES)/dump_apex_info $(apex_vintf_files)

	@echo "Creating apex-info-file in $(PRODUCT_OUT) "

	$< --root_dir $(PRODUCT_OUT) --out_file $@



apex_vintf_files :=



# The build system only writes VINTF metadata to */etc/vintf paths. Legacy paths aren't needed here

# because they are only used for prebuilt images.

check_vintf_common_srcs_patterns := \
@@ -4584,6 +4604,7 @@ check_vintf_common_srcs_patterns := \ 
  $(TARGET_OUT_SYSTEM_EXT)/etc/vintf/% \



check_vintf_common_srcs := $(sort $(filter $(check_vintf_common_srcs_patterns),$(INTERNAL_ALLIMAGES_FILES)))

check_vintf_common_srcs += $(APEX_INFO_FILE)

check_vintf_common_srcs_patterns :=



check_vintf_has_system :=
@@ -4763,10 +4784,12 @@ check_vintf_compatible_args += \ 
  --dirmap /odm:$(TARGET_OUT_ODM) \

  --dirmap /product:$(TARGET_OUT_PRODUCT) \

  --dirmap /system_ext:$(TARGET_OUT_SYSTEM_EXT) \

  --dirmap /apex:$(APEX_OUT) \



ifdef PRODUCT_SHIPPING_API_LEVEL

check_vintf_compatible_args += --property ro.product.first_api_level=$(PRODUCT_SHIPPING_API_LEVEL)

endif # PRODUCT_SHIPPING_API_LEVEL

check_vintf_compatible_args += --apex-info-file $(APEX_INFO_FILE)



$(check_vintf_compatible_log): PRIVATE_CHECK_VINTF_ARGS := $(check_vintf_compatible_args)

$(check_vintf_compatible_log): PRIVATE_CHECK_VINTF_DEPS := $(check_vintf_compatible_deps)

tools/releasetools/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ python_defaults { 
    ],

    required: [

        "checkvintf",

        "deapexer",

        "dump_apex_info",

    ],

}

tools/releasetools/check_target_files_vintf.py

+101 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ Usage: check_target_files_vintf target_files 
target_files can be a ZIP file or an extracted target files directory.

"""



import json

import logging

import subprocess

import sys
@@ -123,7 +124,12 @@ def CheckVintfFromExtractedTargetFiles(input_tmp, info_dict=None): 
    logger.warning('PRODUCT_ENFORCE_VINTF_MANIFEST is not set, skipping checks')

    return True





  dirmap = GetDirmap(input_tmp)



  apex_root, apex_info_file = PrepareApexDirectory(input_tmp)

  dirmap['/apex'] = apex_root



  args_for_skus = GetArgsForSkus(info_dict)

  shipping_api_level_args = GetArgsForShippingApiLevel(info_dict)

  kernel_args = GetArgsForKernel(input_tmp)
@@ -132,6 +138,8 @@ def CheckVintfFromExtractedTargetFiles(input_tmp, info_dict=None): 
      'checkvintf',

      '--check-compat',

  ]

  common_command += ['--apex-info-file', apex_info_file]



  for device_path, real_path in sorted(dirmap.items()):

    common_command += ['--dirmap', '{}:{}'.format(device_path, real_path)]

  common_command += kernel_args
@@ -186,6 +194,98 @@ def GetVintfFileList(): 
  paths = sum((PathToPatterns(path) for path in paths if path), [])

  return paths



def GetVintfApexUnzipPatterns():

  """ Build unzip pattern for APEXes. """

  patterns = []

  for target_files_rel_paths in DIR_SEARCH_PATHS.values():

    for target_files_rel_path in target_files_rel_paths:

      patterns.append(os.path.join(target_files_rel_path,"apex/*"))



  return patterns



def PrepareApexDirectory(inp):

  """ Prepare the APEX data.



  Apex binaries do not support dirmaps, in order to use these binaries we

  need to move the APEXes from the extracted target file archives to the

  expected device locations.



  The APEXes will also be extracted under the APEX/ directory

  matching what would be on the target.



  Create the following structure under the input inp directory:

       APEX/apex             # Extracted APEXes

       APEX/system/apex/     # System APEXes

       APEX/vendor/apex/     # Vendor APEXes

       ...



  Args:

    inp: path to the directory that contains the extracted target files archive.



  Returns:

    extracted apex directory

    apex-info-list.xml file

  """



  def ExtractApexes(path, outp):

    # Extract all APEXes found in input path.

    debugfs_path = 'debugfs'

    deapexer = 'deapexer'

    if OPTIONS.search_path:

      debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static')

      deapexer_path = os.path.join(OPTIONS.search_path, 'bin', 'deapexer')

      if os.path.isfile(deapexer_path):

        deapexer = deapexer_path



    logger.info('Extracting APEXs in %s', path)

    for f in os.listdir(path):

      logger.info('  adding APEX %s', os.path.basename(f))

      apex = os.path.join(path, f)

      cmd = [deapexer,

             '--debugfs_path', debugfs_path,

             'info',

             apex]

      info = json.loads(common.RunAndCheckOutput(cmd))



      cmd = [deapexer,

             '--debugfs_path', debugfs_path,

             'extract',

             apex,

             os.path.join(outp, info['name'])]

      common.RunAndCheckOutput(cmd)



  root_dir_name = 'APEX'

  root_dir = os.path.join(inp, root_dir_name)

  extracted_root = os.path.join(root_dir, 'apex')

  apex_info_file = os.path.join(extracted_root, 'apex-info-list.xml')



  # Always create APEX directory for dirmap

  os.makedirs(extracted_root)



  create_info_file = False



  # Loop through search path looking for and processing apex/ directories.

  for device_path, target_files_rel_paths in DIR_SEARCH_PATHS.items():

    for target_files_rel_path in target_files_rel_paths:

      inp_partition = os.path.join(inp, target_files_rel_path,"apex")

      if os.path.exists(inp_partition):

        apex_dir = root_dir + os.path.join(device_path + "/apex");

        os.makedirs(apex_dir)

        os.rename(inp_partition, apex_dir)

        ExtractApexes(apex_dir, extracted_root)

        create_info_file = True



  if create_info_file:

    ### Create apex-info-list.xml

    dump_cmd = ['dump_apex_info',

                '--root_dir', root_dir,

                '--out_file', apex_info_file]

    common.RunAndCheckOutput(dump_cmd)

    if not os.path.exists(apex_info_file):

      raise RuntimeError('Failed to create apex info file %s', apex_info_file)

    logger.info('Created %s', apex_info_file)



  return extracted_root, apex_info_file



def CheckVintfFromTargetFiles(inp, info_dict=None):

  """
@@ -199,7 +299,7 @@ def CheckVintfFromTargetFiles(inp, info_dict=None): 
    True if VINTF check is skipped or compatible, False if incompatible. Raise

    a RuntimeError if any error occurs.

  """

  input_tmp = common.UnzipTemp(inp, GetVintfFileList() + UNZIP_PATTERN)

  input_tmp = common.UnzipTemp(inp, GetVintfFileList() + GetVintfApexUnzipPatterns() + UNZIP_PATTERN)

  return CheckVintfFromExtractedTargetFiles(input_tmp, info_dict)