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

Commit eb118211 authored by Jooyung Han's avatar Jooyung Han
Browse files

check_target_files_vintf: Support flattened apexes 

Flattened apexes are extracted and copytree()'d to /apex directory to
simulate "activation" on device.

Bug: 242314000
Bug: 239055765
Test: m otapackage # target with "flattened" apexe
Change-Id: I90cc37b5f64ebad1e15f6fc5fa245d0f5955095d

Change-Id: I7e8c3fdf8e4620344d23cee0de509e574206ad9b
parent 09d7031f

tools/releasetools/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ python_defaults { 
        "check_target_files_vintf.py",

    ],

    libs: [

        "apex_manifest",

        "releasetools_common",

    ],

    required: [

tools/releasetools/check_target_files_vintf.py

+19 −13
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ target_files can be a ZIP file or an extracted target files directory. 


import json

import logging

import os

import shutil

import subprocess

import sys

import os

import zipfile



import common

from apex_manifest import ParseApexManifest



logger = logging.getLogger(__name__)
@@ -227,8 +229,6 @@ def PrepareApexDirectory(inp): 
    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:
@@ -237,14 +237,18 @@ def PrepareApexDirectory(inp): 
    if os.path.isfile(deapexer_path):

      deapexer = deapexer_path



  def ExtractApexes(path, outp):

    # Extract all APEXes found in input 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)

      if os.path.isdir(apex):

        # TODO(b/242314000) Handle "flattened" apex

        pass

      else:

      if os.path.isdir(apex) and os.path.isfile(os.path.join(apex, 'apex_manifest.pb')):

        info = ParseApexManifest(os.path.join(apex, 'apex_manifest.pb'))

        # Flattened APEXes may have symlinks for libs (linked to /system/lib)

        # We need to blindly copy them all.

        shutil.copytree(apex, os.path.join(outp, info.name), symlinks=True)

      elif os.path.isfile(apex) and apex.endswith(('.apex', '.capex')):

        cmd = [deapexer,

               '--debugfs_path', debugfs_path,

               'info',
@@ -257,6 +261,8 @@ def PrepareApexDirectory(inp): 
               apex,

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

        common.RunAndCheckOutput(cmd)

      else:

        logger.info('  .. skipping %s (is it APEX?)', path)



  root_dir_name = 'APEX'

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