Commit Graph

168 Commits

Author SHA1 Message Date
Anton Hansson
1710a2efc7 Remove non-existing dependency
We have removed the system-images sdk zip, so remove the tracking of it
as a dependency for the addon.

Bug: 205008975
Test: presubmit
Change-Id: I14e47d6418f355c6c7db7444a25c3030f36a3f92
2022-04-27 15:41:13 +00:00
Anton Hansson
897fe05053 Stop building the system-image zip
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image zip files.

Bug: 205008975
Test: m sdk sdk_repo dist
Change-Id: I11a9aaea89c307d4698787e228fb47228244ab74
2022-04-25 16:24:33 +01:00
Dan Willemsen
53052e34be Remove old build-tools/platform-tools implementation
These packages are now built with Soong. Since they were the only two
outputs of the windows SDK package, I've also removed that
implementation.

Bug: 187222815
Change-Id: Ib42687cfe79c40066a49d20980a0f6f75914406a
2021-10-15 13:39:11 -07:00
Dan Willemsen
ea69f2a8ca Stop disting the monolithic Windows SDK
Since this artifact will no longer be needed shortly when the
build-tools and platform-tools sdk_repo builds are refactored not to use
it as an input.

This will save artifact space and provide an early warning in case
anyone is depending on this artifact.

Bug: 187222815
Change-Id: Ia61c8d1d675b6a64cb46c71f47528e1dd6f7bb71
2021-09-16 15:00:25 -07:00
Dan Willemsen
7a0a133eba Stop relying on /usr/bin/python for SDK builds
Instead, use python2 from $PATH, which will be a prebuilt inside the
build system.

Test: treehugger
Change-Id: I81966e85377c8e9dd87e1f2656f6c0ec6b3a636c
2021-08-05 17:14:01 -07:00
Colin Cross
b9d10f8d7c Include 64-bit version of libaapt2_jni.dll in windows SDK
AAPT2 can be invoked through JNI by loading the libaapt2_jni.dll library
in the JVM.  Provide a 64-bit version of libaapt2_jni.dll for 64-bit
JVMs.

Fixes: 150355628
Test: manually inspect sdk-repo-windows-build-tools-*.zip
Change-Id: Iebf1ded45d0c2901f0f3905f2b37a8801c378a4e
2020-12-22 16:34:13 -08:00
Treehugger Robot
54f911f8b2 Merge "Don't use unzip -t when unzip -l will do." am: a803d77648 am: c26bc5cc4f
Change-Id: I36e4532c3030fc22f112c6ecb3d22f26aa1f80ce
2020-05-21 23:16:20 +00:00
Elliott Hughes
ad140286f3 Don't use unzip -t when unzip -l will do.
It's a *lot* more expensive, and ziptool doesn't support it. I can
easily add the functionality, but since our only user seems to be a
mistake, that wouldn't be my first choice!

Test: treehugger
Change-Id: Iab1a326e4cec3520942adaf9f3c9bb424adf4c35
2020-05-21 14:09:24 -07:00
David Gross
a893a3fa39 Move lld.exe (windows) and add dependent library libwinpthread-1.dll
Move lld.exe to lld-bin directory; add lld-bin/libwinpthread-1.dll; add
trampoline.

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld.exe depends on libwinpthread-1.dll and windows looks for it in the
same directory as lld.exe.  Unfortunately, there's already a 32-bit
libwinpthread-1.dll at the tool root (used by 32-bit executables at
the tool root), and lld.exe is a 64-bit executable, so it needs its own
directory and its own library.

In the old location of lld.exe, we add a trampoline executable (a build
artifact) in lld-bin; this means Gradle, which invokes lld.exe in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo

Merged-In: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
Change-Id: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
(cherry picked from commit 24e52959d7)
2020-03-17 13:45:39 -07:00
David Gross
24e52959d7 Move lld.exe (windows) and add dependent library libwinpthread-1.dll
Move lld.exe to lld-bin directory; add lld-bin/libwinpthread-1.dll; add
trampoline.

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld.exe depends on libwinpthread-1.dll and windows looks for it in the
same directory as lld.exe.  Unfortunately, there's already a 32-bit
libwinpthread-1.dll at the tool root (used by 32-bit executables at
the tool root), and lld.exe is a 64-bit executable, so it needs its own
directory and its own library.

In the old location of lld.exe, we add a trampoline executable (a build
artifact) in lld-bin; this means Gradle, which invokes lld.exe in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo

Change-Id: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
2020-03-02 17:45:53 -08:00
Elliott Hughes
e011551a05 Merge "sdk_clean.sh: the mac is now using the same sed as linux." am: 5502f2c591 am: e8ae12f12a am: c847d216ca
am: f0f236b337

Change-Id: I77705040dc2878130d5edb31b1bf0061c74f8447
2019-10-09 17:45:38 -07:00
Elliott Hughes
80c8559132 sdk_clean.sh: the mac is now using the same sed as linux.
Test: builds
Change-Id: I783287d9a7ee7c3157a6275f011dbf05653c5a62
2019-10-09 12:24:59 -07:00
Elliott Hughes
c1791675fa Merge "Remove macOS-specific workaround." am: e5be747906 am: 6f92a637bd am: 04eb0f1801
am: ba59db4045

Change-Id: I49396f8587046cfa96e49ecd739ca5be6736613c
2019-09-06 14:32:10 -07:00
Elliott Hughes
046f45a04e Remove macOS-specific workaround.
We now use the same stat on macOS as on Linux, so this breaks the build.

Test: treehugger
Change-Id: I1a9ef44d9cef17b5a4df068e86d1c1208fc19d11
2019-09-06 09:28:20 -07:00
diegoperez
b59621013c Limit size of arguments passed to line_endings
This avoids the call to line_endings failing with "argument list too
long".

Test: make sdk
Change-Id: I1ff222ede731e5ca0bb6361801560a96e6e1f586
2019-04-10 17:30:35 +01:00
Dan Willemsen
f0407b3cb8 Clean up sdk building, use built xmllint
Instead of relying on xmllint from the path, with could come from the
host, or sometimes a built version, always use the built version
explicitly.

This does some general cleanup of these make rules as well, using fewer
global variables inside make rules, and cleaning variables up at the end
of the file. I added some missing dependencies and removed some uses of
$(TOPDIR) too.

I did not clean up the uses of `zip` that make these rules
non-deterministic, but I filed b/117562080 for that, since it could use
some larger refactoring.

Test: lunch sdk_arm64-userdebug; m sdk sdk_repo dist
Change-Id: Ia0736d5fc7475603cf31f385b3ada11d9e775259
2018-10-10 21:21:20 -07:00
Dan Willemsen
844cfa4538 Clean up windows sdk build
* Pass ATREE_STRIP to use hermetic strip tool
* Stop using sdk/build/..., which has been empty
* Use soong_zip for faster, more reproducible zip files
* Add more dependencies
* Remove some echos to clean up output

Test: m win_sdk
Change-Id: I9bfbf6565dbeb4cc48ddd037596b8408ea3c3157
2018-08-28 00:13:28 -07:00
Josh Gao
610418d6aa AdbWinApi: switch to Android.bp.
Bug: http://b/71721338
Test: manually ran adb/fastboot on windows
Change-Id: Ia4b63776f7abc7655940a928995be647c28d1b5c
2018-01-08 18:51:52 -08:00
Dan Willemsen
b401d6b43c Dist the windows 64-bit libaapt2_jni
Bug: 36697262
Test: m -j dist win_sdk
Change-Id: Ie1a0f7fc0eeb3f32b20c3bc9a988c9bd7b385fdd
2017-04-04 17:19:13 -07:00
Alan Viverette
af9c8f24f7 Restore "Remove Support Library from SDK build"
This reverts commit 5e690a21eb.

Test: make -j29 PRODUCT-sdk_phone_mips-sdk sdk_repo
Change-Id: I5aff9d6792a50b6e8eaca396a189724b4043bc81
2017-03-18 06:00:56 -04:00
Adam Lesinski
8bb66e66d1 Add libaapt2_jni to SDK build
Test: manual check
Change-Id: I5cfdf10d64f60acdc507749fe9b9ab456dd826ee
2016-11-08 11:39:47 -08:00
Justin Klaassen
e44c67ce7b Exclude samples directories
Bug: 31202928
Test: Manually verified that sample sources are no longer included.
Change-Id: I28b2b4e4fc57c0f6e787c5b840f3cff03ee543e7
2016-08-31 17:42:17 -07:00
Justin Klaassen
631a75eb58 Properly exclude hosttests/tools/tests directories
There was a typo that resulted in the ignored directory names being
concatenated rather than included individually in the list. This caused
us to unintentionally publish the "wrong" sources for all releases
since Mar 23, 2012.

Bug: 30798902
Change-Id: I51e3ad48c4487374fe5614d074c1c0f091d430e0
(cherry picked from commit 31dde68d9c361dbdbe9092918f8224da2471b576)
2016-08-16 18:43:37 +00:00
Adam Lesinski
355f971d42 Add AAPT2 to SDK build
Change-Id: I5e4072385ad7cbf86b435571b5e6149270c5eb1e
2016-03-10 20:08:15 -08:00
Dan Willemsen
033ea23f59 am 7ad271e7: Merge "Update windows sdk to build non-recursively"
* commit '7ad271e7742a904485c8fdf51206ba068bf5160f':
  Update windows sdk to build non-recursively
2015-09-09 18:19:05 +00:00
Dan Willemsen
349f891d94 Update windows sdk to build non-recursively
Now the build system can support a HOST_CROSS_OS to build both linux and
windows binaries at the same time.

Bug: 23566667
Change-Id: I82b497c2621fbfbe493d0568fca42863c5fe9433
2015-08-28 13:30:16 -07:00
Dan Willemsen
ab842478d4 am 283439c7: am d592f8c7: Merge "Remove the mingw package check"
* commit '283439c70091ab77daa566884db2c0f20bcac5c9':
  Remove the mingw package check
2015-08-13 21:46:25 +00:00
Dan Willemsen
cb994dd019 Remove the mingw package check
We're using mingw prebuilts checked into the tree now, the external
package is no longer necessary.

Change-Id: I349f9605d3d09decc3ec5df3ba595728c0a2727c
2015-08-13 14:27:23 -07:00
Stephen Hines
cfa3da6aae am 5cf9df16: am 2ca0c6f9: Merge "Add clang.exe to Windows SDK build."
* commit '5cf9df169626377218d86ee2bc1c464c9791741c':
  Add clang.exe to Windows SDK build.
2015-06-25 21:46:02 +00:00
Stephen Hines
eb8b46d7a7 Add clang.exe to Windows SDK build.
Bug: 22044739

This is needed as part of the NDK itself, now that we are shipping the
platform Clang as the one true Clang. It can be built by doing:

make winsdk-tools

Change-Id: I3363f46b5dcc52258aa92b42b5a92a96bf868e73
2015-06-25 14:11:11 -07:00
bohu
52e0bf3967 Fix size and sha1sum for some sdk targets
Targets such as sdk_google_phone_{x86,arm,...}-sdk
have wrong size and sha1sum in the repo-sys-img.xml,
because the sdk_repo.mk file incorrectly over-writes
the final images zip.

bug: 20927015

Change-Id: I151c8759c299d4a943f00ca2734ef65dea727262
2015-06-01 17:35:50 -07:00
Ying Wang
2d0ce7b832 am 214797ac: Merge "Update the winsdk-tools prerequisites."
* commit '214797acbe66390a012d2ba47200f6e8330d5c33':
  Update the winsdk-tools prerequisites.
2015-01-27 22:12:38 +00:00
Ying Wang
b6549fd3fc Update the winsdk-tools prerequisites.
To build the windows SDK tools, we need only the Linux llvm-tblgen and
clang-tblgen, but not llvm-rs-cc or bcc_compat.
This reduces significantly build time if you want run only "make
winsdk-tools".

Bug: 19149444
Change-Id: I971dd6a6e1a7dd11a968ee8be8cd02085055c262
2015-01-27 12:43:53 -08:00
Adam Lesinski
5e44c8833f am 94527b09: am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev
* commit '94527b094fbcbf73ce00ecfcdc2ee31aa74ccd1e':
  Add split-select tool to SDK build.
2014-11-11 01:06:01 +00:00
Adam Lesinski
d155da9790 Add split-select tool to SDK build.
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
2014-11-05 11:34:03 -08:00
Narayan Kamath
d515d6c5c4 resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp
Change-Id: If9f3110e57131f13c55a87169dbdc2cd8cf74660
2014-10-02 14:35:25 +01:00
Stephen Hines
513c112f91 resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp
Change-Id: I540734e15e984d12b81cc47d90430e40cc3d2397
2014-10-01 16:12:34 -07:00
Stephen Hines
3f2caae206 Restore the ability to build RS-related binaries on Windows.
Bug: 14416410

This change reverts two prior commits (listed below):

Revert "Use renderscript prebuilts for windows."
This reverts commit ebacf02e88.

Revert "Temporarily disable rs/bcc in win_sdk"
This reverts commit c63c2d31ba.
2014-09-30 02:35:08 -07:00
Raphael Moll
a5739c851c am 130967f3: Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev
* commit '130967f3d3f34fc656dc43e43087d0a0c3ae5439':
  SDK Addon multi-sys-img support, part 2.
2014-09-12 05:43:02 +00:00
Raphael Moll
fa090e240f SDK Addon multi-sys-img support, part 2.
Change the sdk_repo rule to generate a system-image zip package and its
corresponding XML for the addon.

Change-Id: I3c2318d2085362f62784415713b44cc8fe97ea9c
2014-08-21 16:00:12 -07:00
Leandro Gracia Gil
653fe8eb04 Add the protobuf compiler binary to the Windows SDK build.
Change-Id: I0acca9fc39b8b5528a1ca4bf25b0bacb32b515e2
2014-07-28 15:25:41 -07:00
Ji-Hwan Lee
e3e3de0cef Fix sdk build, really this time
Change-Id: I5cddf63a6dc30dee5185a3a6a4e352c574a87213
2014-06-22 04:26:56 +09:00
Ji-Hwan Lee
5cd3de1cc6 Fix sdk builds
Change-Id: Ifca3f430795bf002ecc7bf77b38c2336e578c5fc
2014-06-21 17:19:49 +09:00
Xavier Ducrohet
b931fca7eb resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp
Change-Id: I8657c95b169320957629b492fef11994227b3c56
2014-06-20 17:51:14 -07:00
Xavier Ducrohet
f78598f754 Fix repo script to ignore tools. DO NOT MERGE.
(cherry picked from commit d81eb5d833)

Change-Id: I7dbd0db25b84a11c36fcd570935357b0e755555c
2014-06-20 08:24:05 -07:00
Ying Wang
e7db94431e Switch to SDK_HOST_ARCH
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.

Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
2014-06-09 15:03:04 -07:00
Raphael Moll
26bcf6a511 Move SDK system-image source.prop_templates in their own folder.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
2014-06-03 17:30:16 -07:00
Raphael Moll
4df9f469f7 Fix SDK repo to prevent mixing different targets.
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
2014-06-02 17:11:45 -07:00
Raphael Moll
ea40d2f4c5 SDK: support generating repository XML with latest XSD.
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
2014-05-15 17:49:02 -07:00
Xavier Ducrohet
d81eb5d833 Fix repo script to ignore tools
Change-Id: I80e6d5802f9a4633378d432eff3e91c2fcf83eeb
2014-05-08 12:26:20 -07:00