[gentoo-commits] proj/android:master commit in: dev-util/soong/

[Benda XU]

commit:     d8601082c9ef4f781769a2b365e46957ca083bd5
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 10 03:22:50 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 03:22:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/android.git/commit/?id=d8601082

dev-util/soong: distribute root.bp.

  This mocks the Android build system more closely.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/soong/Manifest               | 2 +-
 dev-util/soong/soong-8.1.0_p41.ebuild | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-util/soong/Manifest b/dev-util/soong/Manifest
index fb9e44f..dbae562 100644
--- a/dev-util/soong/Manifest
+++ b/dev-util/soong/Manifest
@@ -3,5 +3,5 @@ AUX soong-bootstrap-clean.patch 1588 BLAKE2B 
ec20e7fece7c126a19586d1a6db7264f64f
 AUX soong-no-kernel-header.patch 346 BLAKE2B 
9e830f028a47a031b46c5cefbc4ddafc922b1506756ba36266aa97f48e670efd1bae8a438f712add004b17fff3bf3c3f4c059a48039ee6ef619afc39163445d2
 SHA512 
b0ae8e277050911baf262a54c7324f03d69e5f8dd87505942d0a554451e69c6d6f0668801b83d66ac5c69d7827ea7d613d1d55e376c761c7e1f54c3b1ff286be
 DIST blueprint-8.1.0_p41.tar.gz 114222 BLAKE2B 
cb2335fd766212d1c3279ae4d6ee91df5f3c3a9522230ca70cbc080eed9b387a7d567963ba8ea5ffc4a48b01400958cc1d619b9da897e0f90a29b4446becdf46
 SHA512 
8ada4f309767567e7e08e6c8e61f0e442eb14a59333323bb6b47bb72c2b923bbb342166cddf6d31ec05a27f70ae60a981c0c8b4a3438820ce20ef47028e9f02b
 DIST soong-8.1.0_p41.tar.gz 355543 BLAKE2B 
0d2b47c30d0515426cffa19c73495f68633dcdbcd5fc33fbbabb8892b712eb85ec68657ea73e07b34573af525055c0f791cd6b54ca58dedd5c14bd4af1a37623
 SHA512 
50f65ac86f4466adfed6fddf6e8288e16fdc0c1717ba57e59d40395115d4f55ceed3407ce6542ef0173c2076783a7bdc908ff0aac6f19aad7c62a8f63daef6e3
-EBUILD soong-8.1.0_p41.ebuild 1606 BLAKE2B 
e67a0f3bdad0b00ae79ea367bb430bc5a598843238d8c8c4bd9fa69baa86942fabc125f54ae833aa37a57f77194f15e19f3579705033c840c5fb87f5dcdc915a
 SHA512 
5bf6928f0d84903ddba4b2b461127af6af45cc0ead533352026304a4dc1972be989cecb385778a10b92fb62c953da097a7c2114ac23a6cd26179302e600903ee
+EBUILD soong-8.1.0_p41.ebuild 1676 BLAKE2B 
f262faa3e8dbe45414160220975c8ca5c64104f3479f8b4fc2bc2fe50b79ce2af3a732375616906c7db1a13b0295dc21e937a208f670aa37d404badd79d2ed68
 SHA512 
da536c2b5f000739a70c8a932f921ef2d52e3e73e4062dfa4b4c13b56612a6e95346b5cc425f8bfe79493c04e52a79e759d8abf704ae090caaa1f6a5b0a64aca
 MISC metadata.xml 242 BLAKE2B 
08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928
 SHA512 
ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21

diff --git a/dev-util/soong/soong-8.1.0_p41.ebuild 
b/dev-util/soong/soong-8.1.0_p41.ebuild
index 7f381cc..9d5c13a 100644
--- a/dev-util/soong/soong-8.1.0_p41.ebuild
+++ b/dev-util/soong/soong-8.1.0_p41.ebuild
@@ -58,6 +58,7 @@ src_install() {
        dobin out/.bootstrap/bin/*
        dodoc out/.bootstrap/docs/*
        sed -n '/\/\/.*host bionic/,$p' < build/soong/Android.bp > 
"${T}"/Android.bp
+       sed '/build = \[/,+3d' < build/soong/root.bp > "${T}"/root.bp
        insinto /usr/share/soong
-       doins "${T}"/Android.bp
+       doins "${T}"/{Android,root}.bp
 }