Support new binder32bit property
Starting in VNDK snapshot v28 (P), prebuilts built for 32-bit
binder interface are isolated in separate 'binder32' subdirectory
under prebuilts/vndk/v{VER}/{ARCH}/. All other prebuilts are
assumed to use 64-bit binder interface.
To differentiate prebuilts per binder bitness, the following
changes are made:
1) a new 'binder32bit' property added to the Android.bp files
autogenerated for the vndk_prebuilt_shared soong module
2) new phony modules, vndk_v{ver}_{arch}_binder32, defined for
32-bit binder prebuilts,
3) 'binder32' suffix added to the prebuilt versioned name,
e.g. libfoo.vndk.{ver}.{arch}.binder32.vendor
Test: python gen_buildfiles.py 28 -vv
Test: python gen_buildfiles.py 27 -vv
Bug: 78279738
Change-Id: I283fe25a34d3381d13097ede34c428c83dffe11e
This commit is contained in:
@@ -33,6 +33,7 @@ MANIFEST_FILE_NAME = 'manifest.xml'
|
||||
MODULE_PATHS_FILE_NAME = 'module_paths.txt'
|
||||
NOTICE_FILES_DIR_NAME = 'NOTICE_FILES'
|
||||
NOTICE_FILES_DIR_PATH = os.path.join(COMMON_DIR_PATH, NOTICE_FILES_DIR_NAME)
|
||||
BINDER32 = 'binder32'
|
||||
|
||||
|
||||
def set_logging_config(verbose_level):
|
||||
@@ -81,21 +82,21 @@ def get_dist_dir(out_dir):
|
||||
return _get_dir_from_env('DIST_DIR', join_realpath(out_dir, 'dist'))
|
||||
|
||||
|
||||
def get_snapshot_variants(install_dir):
|
||||
"""Returns a list of VNDK snapshot variants under install_dir.
|
||||
def get_snapshot_archs(install_dir):
|
||||
"""Returns a list of VNDK snapshot arch flavors under install_dir.
|
||||
|
||||
Args:
|
||||
install_dir: string, absolute path of prebuilts/vndk/v{version}
|
||||
"""
|
||||
variants = []
|
||||
archs = []
|
||||
for file in glob.glob('{}/*'.format(install_dir)):
|
||||
basename = os.path.basename(file)
|
||||
if os.path.isdir(file) and basename != COMMON_DIR_NAME:
|
||||
variants.append(basename)
|
||||
return variants
|
||||
archs.append(basename)
|
||||
return archs
|
||||
|
||||
|
||||
def arch_from_path(path):
|
||||
def prebuilt_arch_from_path(path):
|
||||
"""Extracts arch of prebuilts from path relative to install_dir.
|
||||
|
||||
Args:
|
||||
@@ -107,14 +108,14 @@ def arch_from_path(path):
|
||||
return path.split('/')[1].split('-')[1]
|
||||
|
||||
|
||||
def variant_from_path(path):
|
||||
"""Extracts VNDK snapshot variant from path relative to install_dir.
|
||||
def snapshot_arch_from_path(path):
|
||||
"""Extracts VNDK snapshot arch from path relative to install_dir.
|
||||
|
||||
Args:
|
||||
path: string, path relative to prebuilts/vndk/v{version}
|
||||
|
||||
Returns:
|
||||
string, VNDK snapshot variant (e.g. 'arm64')
|
||||
string, VNDK snapshot arch (e.g. 'arm64')
|
||||
"""
|
||||
return path.split('/')[0]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user