tequilaOS/platform_build_soong

Author SHA1 Message Date

Author	SHA1	Message	Date
Jooyung Han	4791cb507b	Move compat symlinks from makefile to soong Two APEXes (i18n, art) requires compat symlinks and these symlinks are created via ld.config.txt module's POST_INSTALL_CMDS. $ m installclean $ m ld.config.txt $ tree $OUT/system .../system ├── bin │ ├── dalvikvm -> /apex/com.android.art/bin/dalvikvm │ └── dex2oat -> /apex/com.android.art/bin/dex2oat ├── etc │ └── ld.config.txt └── usr └── icu -> /apex/com.android.i18n/etc/icu By the way, ld.config.txt is going to removed since linkerconfig generates it on device. So, we're moving symlink creation from ld.config.txt(rootdir/Android.mk) to APEXes' POST_INSTALL_CMDS. $ m installclean $ m com.android.i18n $ tree $OUT/system .../system ├── apex │ └── com.android.i18n.apex └── usr └── icu -> /apex/com.android.i18n/etc/icu $ m installclean $ m com.android.art $ tree $OUT/system .../system ├── apex │ └── com.android.art.debug.apex ├── bin │ ├── dalvikvm -> /apex/com.android.art/bin/dalvikvm │ └── dex2oat -> /apex/com.android.art/bin/dex2oat Bug: 143192278 Test: m && boot (since these two apexes are bootstrap apexes) Change-Id: Ib29ea9f9ac40e74f78cd530e7daef8c51292fd24	2019-12-24 14:00:47 +09:00
Jooyung Han	27151d93b6	Override package name for VNDK APEX com.android.vndk.v<VER> is overridden with com.google.android.vndk.v<VERE>. Test: m com.android.vndk.current && aapt2 dump badging ../system/apex/com.android.vndk.current.apex Change-Id: I623d7a144418d7198f0bbf09c5dc983ed1a631c6 Merged-In: I623d7a144418d7198f0bbf09c5dc983ed1a631c6 (cherry picked from commit `0ed1b1b169`)	2019-12-17 15:22:21 +00:00
Jiyong Park	09d77522fe	split apex.go apex.go is too big. Separate the build rule and android.mk generation logic into builder.go and androidmk.go, respectively. prebuilt_apex is moved to prebuilt.go as well. No refactoring has been made other than the splitting. Test: m Change-Id: I839ab0a1ba2b70ce82d98ac1fa8e3534808b5fd3	2019-11-18 16:37:06 +09:00

Jooyung Han

4791cb507b

Move compat symlinks from makefile to soong

Two APEXes (i18n, art) requires compat symlinks and these symlinks are
created via ld.config.txt module's POST_INSTALL_CMDS.

  $ m installclean
  $ m ld.config.txt
  $ tree $OUT/system

.../system
├── bin
│   ├── dalvikvm -> /apex/com.android.art/bin/dalvikvm
│   └── dex2oat -> /apex/com.android.art/bin/dex2oat
├── etc
│   └── ld.config.txt
└── usr
    └── icu -> /apex/com.android.i18n/etc/icu

By the way, ld.config.txt is going to removed since linkerconfig
generates it on device.

So, we're moving symlink creation from ld.config.txt(rootdir/Android.mk)
to APEXes' POST_INSTALL_CMDS.

  $ m installclean
  $ m com.android.i18n
  $ tree $OUT/system

.../system
├── apex
│   └── com.android.i18n.apex
└── usr
    └── icu -> /apex/com.android.i18n/etc/icu

  $ m installclean
  $ m com.android.art
  $ tree $OUT/system

.../system
├── apex
│   └── com.android.art.debug.apex
├── bin
│   ├── dalvikvm -> /apex/com.android.art/bin/dalvikvm
│   └── dex2oat -> /apex/com.android.art/bin/dex2oat

Bug: 143192278
Test: m && boot (since these two apexes are bootstrap apexes)
Change-Id: Ib29ea9f9ac40e74f78cd530e7daef8c51292fd24

2019-12-24 14:00:47 +09:00

Jooyung Han

27151d93b6

Override package name for VNDK APEX

com.android.vndk.v<VER> is overridden with
com.google.android.vndk.v<VERE>.

Test: m com.android.vndk.current
    && aapt2 dump badging ../system/apex/com.android.vndk.current.apex
Change-Id: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
Merged-In: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
(cherry picked from commit 0ed1b1b169)

2019-12-17 15:22:21 +00:00

Jiyong Park

09d77522fe

split apex.go

apex.go is too big. Separate the build rule and android.mk generation
logic into builder.go and androidmk.go, respectively. prebuilt_apex is
moved to prebuilt.go as well.

No refactoring has been made other than the splitting.

Test: m
Change-Id: I839ab0a1ba2b70ce82d98ac1fa8e3534808b5fd3

2019-11-18 16:37:06 +09:00

3 commits