Commit graph

12 commits

Author SHA1 Message Date
Jooyung Han
a3c987d7f3 Skip *.libraries.txt when skipping current vndk
When TARGET_SKIP_CURRENT_VNDK=true current vndk libs are not installed.
Related *.libraries.txt files also should not be installed.

Bug: 132140714
Bug: 137511540
Test: TARGET_SKIP_CURRENT_VNDK=true m systemimage # and, look into /system/etc
Change-Id: Ieea7444c359410dd9a14ac0dd369cae38d18b63a
2019-09-09 11:19:19 +09:00
Bowgo Tsai
ac3c65b7bb Reland: Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Test: rm -rf out && build/soong/soong_ui.bash --make-mode \
      TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug droid
Change-Id: Iae9f5fb688f49497563864eb882d5f0ae33c744a
2019-09-05 17:11:07 +08:00
Ian Kasprzak
cba65a9c92 Revert "Moving GSI-specific files to system_ext"
This reverts commit 8ef0ffe7e8.

Reason for revert: b/140499897 - Breaking multiple builds across branches.
Test: Forrest - go/forrest_run/L78500000361846284

Change-Id: I618e0d051fdcd7a7afcc09408e20c53f38566e94
2019-09-05 01:03:17 +00:00
Bowgo Tsai
8ef0ffe7e8 Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Change-Id: Ida7c2d1b0152c7ef77fa9aeb5d0766d17aec59c5
2019-09-04 14:54:53 +08:00
Juju Sung
3021218d2a Remove extra brackets in vndk_packages collecting phase
Built target with syntax error near unexpected token `llndk.libraries.txt'
Unpaired brackets makes syntax error in collecting vndk_packages.

Test: build&flashed
Bug: 140097958
Change-Id: I65683a1fc3e7d2f1c8e4eeb471b23620d48c7c41
2019-08-30 09:59:51 +09:00
Hsin-Yi Chen
5cbf33afe9 Add tags to lsdump_paths.txt
- Update the conversion from LSDUMP_PATHS to lsdump_paths.txt.
  LSDUMP_PATHS is a list of "tag:path". Each element is converted to
  "tag: path\n" in lsdump_paths.txt.

- Update the check for redundant ABI dumps.
  prebuilts/abi-dumps/ndk contains the ABI dumps for NDK.
  prebuilts/abi-dumps/vndk contains those for LLNDK, VNDK-core, VNDK-SP,
  except NDK.

Test: make findlsdumps
Bug: 133176785
Change-Id: I90559e6c68a7f901a318cd8d5125e9a7401ac22c
2019-08-05 11:20:22 +08:00
Przemyslaw Szczepaniak
b4befed86f Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX" 2019-07-24 09:12:18 +00:00
Hsin-Yi Chen
07ece13f06 Ensure no redundant ABI reference dumps
This commit ensures that all ABI dumps under prebuilts/abi-dumps/ have
corresponding NDK/VNDK libraries. When an NDK/VNDK library is removed
but its ABI dump isn't, the build system reports an error.

The build system does not check whether all NDK/VNDK libraries have ABI
reference dumps because the owners of the libraries may intend to
disable ABI check in some cases.

Test: touch prebuilts/abi-dumps/vndk/R/32/x86/test.so.lsdump && make
Bug: 132140703
Change-Id: I615ac8b509f151b75f57f35cd78c518fae798974
2019-07-23 14:20:21 +08:00
Przemyslaw Szczepaniak
f67c72b34d Move libneuralnetworks.so to com.android.neuralnetworks APEX
Test: build&flashed crosshatch image
Bug: 137320025

Change-Id: Iadbb32cffc636c515a5e89b62539183ebc0c2f14
2019-07-19 16:41:48 +01:00
Jooyung Han
9340a673cd make: Add support to skip current VNDK install
You can get a system.img without current VNDK libs.
This may help when you want a smaller system.img given that the image
will be used with a specific version (not current) of vendor image.

Bug: 132140714
Test: m TARGET_SKIP_CURRENT_VNDK=true && see if current VNDK is not
installed

Change-Id: Ie0815e6dd6ce2f861b6c42e637da4bb146320673
2019-05-25 02:06:08 +09:00
Justin Yun
89443aed80 Add an option not to install all VNDK libs
When using VNDK snapshot, current VNDK libs are not required. Use
"TARGET_SKIP_CURRENT_VNDK=true" to skip installing current VNDK libs.

Bug: 123607022
Test: TARGET_SKIP_CURRENT_VNDK=true PRODUCT_EXTRA_VNDK_VERSIONS=28 m -j
Change-Id: I65c902c71a7952536bbf824a1dccb9360e843f1a
2019-02-13 10:46:10 +09:00
SzuWei Lin
2d541f35cd Apply skip mounting product and other partitions in GSI
Uses skip_mount.cfg for `init` to skip mounting product and
product_service paritions in GSI. The patch also removes
the un-mount in `init.gsi.rc`.

With this patch, a device with flashing GSI will not use the
content in product/prodcut_service partitions on the device
and will always use the content under /system/product in GSI.

The patch also rename the target/product/vndk to
target/product/gsi.

Bug: 120208657
Bug: 117246558
Test: Boot blueline master/P with flashing aosp_arm64-userdebug
Test: /product and /product_service should be symbolic links
Change-Id: Idc9c60e5a05b3d90fc4ab64b0ac000571849b19b
2018-12-19 14:42:27 +08:00
Renamed from target/product/vndk/Android.mk (Browse further)