Commit Graph

138 Commits

Author SHA1 Message Date
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
Raphael Moll
438cc639d0 Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
This reverts commit 4a747f67b0.
2014-05-05 14:57:16 -07:00
Raphael Moll
4a747f67b0 win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.
This deactivate building all the exe binaries
and prevents atree from running (both for dev.git
and sdk.git). This still results in a win_sdk folder
so that the sdk_repo rule can work, but the generated
sdk will only contain linux binaries and is not to be
used for production, obviously.

Change-Id: I99cd27a050278afae3b62d1ef34a0a1a542bfd1a
2014-05-03 19:07:57 +00:00
Raphael Moll
c63c2d31ba Temporarily disable rs/bcc in win_sdk
Change-Id: Ic3c49f14098662c83167151a2abc7f46d847c67f
2014-05-02 12:21:17 -07:00
Siva Velusamy
aeccc70002 am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
* commit '777285ceedba8cda5fb0fe0843fae6a887522c03':
  samples: Do not attempt to clean line endings for *.py
2013-10-09 15:02:49 -07:00
Siva Velusamy
de3fa5df07 samples: Do not attempt to clean line endings for *.py
The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py

Change-Id: I355cbc4c77cfb3c90e4615962863288680389bce
2013-10-09 09:30:08 -07:00
Raphael Moll
382966f30c am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
* commit '47605d10f9647d21c3b350e944fe0d0f5efdc4e6':
  SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:15:53 -07:00
Raphael Moll
7657a59083 SDK Repository: switch to sdk addon revision 6.
addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)

Change-Id: Ia37e75a2c8f86f4ecf36edb218f7e243f66a0b36
2013-09-30 11:57:17 -07:00
Stephen Hines
d50554a5ca Add bcc_compat to list of required SDK product packages.
Change-Id: I890e6461672ffbaf589b72bac02d5c09ef2b370e
2013-08-06 17:41:46 -07:00
Stephen Hines
4483ade6b2 Add frameworks/rs and bcc_compat to windows SDK whitelist.
Change-Id: I81ff95e98bd827051336709d822f953295269d62
2013-07-31 17:54:37 -07:00
Raphael Moll
9ca69cf21f SDK: Generate build-tools package.
(cherry-picked from bc7c8c5fc5)

Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
2013-03-22 13:38:56 -07:00
Raphael Moll
11ad495f11 am 205d337b: am 6d1249e6: Merge "SDK: Generate build-tools package."
* commit '205d337b9db27ef87b2849bef0ac092b3200cb1e':
  SDK: Generate build-tools package.
2013-03-22 11:11:36 -07:00
Raphael Moll
bc7c8c5fc5 SDK: Generate build-tools package.
Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
2013-03-22 10:29:15 -07:00
Raphael Moll
862ae1efae Adjust sdk to new prebuilts location.
Change-Id: I4a2cb710ef3c22b7b3c90e5b4ee7757087ebe44c
2013-02-06 16:45:26 -08:00
Raphael Moll
e26f9f9755 Fix SDK build: use repository XML schemas from new prebuilts.
Change-Id: I32799751cb19db2f99b45c26b7e308b1e11af161
2013-01-16 16:03:31 -08:00
Raphael Moll
437419089c SDK: fix sdk_repo build.
The makefile for sdk_repo looks for the repository/addon XSD files in the tree,
these paths needed to be adjusted due to the recent reorganization.

Change-Id: I50120542f78dc72da51b4d5377214c064ec68c01
2012-12-10 13:06:52 -08:00
Raphael Moll
b06504185e SDK: Ability to generate repos in XSD repository-7.
Change-Id: Idc4c75a99625342128e59ea06fe8d30c5b2f56b7
2012-05-10 23:24:19 -07:00
Raphael Moll
3fb225fbfd Support for Windows SDK pre-requisite module list.
Requires sdk.git change I08fc98f2e1

Change-Id: I7388d7292d175ceac221ce6790655b37f85e8a32
2012-04-23 13:16:16 -07:00
Raphael Moll
f413515f16 Merge SDK support for source.properties templates.
Requires build.git change Ib36928097

Change-Id: Ida0c471fe166a1388584f2cf2250e07040ed0e55
2012-03-27 11:59:06 -07:00
Jean-Baptiste Queru
e35ac78cd4 Fix build - configure for schema-v4 output
Change-Id: I26b334e54b38cba49e84212fbe40250fb16dc738
2012-03-22 15:51:17 -07:00
Raphael Moll
8f7e1f7a95 SDK: generate repo using latest schemas when available.
This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
2012-03-21 19:08:11 -07:00
Raphael Moll
bd23502167 SDK: fix script creating platform source archive.
It turns out that the way I use Python to create ZIP
archives is plain wrong. Some files simply don't have the
right size and we get EOFException when unzipping with
Java's ZipFile.

This change adds a flag to instead simply copy all the
files we want and then run the 'zip' system command.
The python zip facility is left there intact in case
I want to go back and fix it later (I'm going to assume
it's my usage that's wrong before really blaming python).

Change-Id: Iea178a49be0bf23c91c01a2e036ae7a76def2b55
2011-11-30 22:39:29 -08:00
Raphael Moll
3d308aa22c SDK: generate support library package on build server.
Also fix packaging of system image (it had an extra root
directory in it, e.g. it was packaging android-4/armeabi-v7a/
instead of just armeabu-v7a/)

Change-Id: I0254b2680168d25103222f8871b2af37a7406b58
2011-10-01 23:44:08 -07:00
Raphael Moll
fdefc0238a SDK: tweak source package (add com.android. sources)
Change-Id: Id1ad2d482c7f0cf58c5832f321997bb3b57d1f24
2011-10-01 23:42:04 -07:00
Raphael Moll
da9eabde86 SDK: Generate source packages as part of 'make sdk_repo'
Change-Id: Iaea55bae22b2af95993d0f97023a015f2c5a5e77
2011-09-28 11:26:20 -07:00
Raphael Moll
4dedff68c2 SDK: generate system-image.zip in sdk_repo
Also:
- in the images_*_source.props, we can't have the platform
  version name (the human readable string). It's not a valid
  property of the XML.
- disable the included-abi in the platform.

Change-Id: I3db62fde5e436bbe8f8e69eb1495ca4e6b954ba2
2011-09-27 20:17:07 -07:00
Raphael Moll
3acd4823bb SDK: use XSD v5 props when generating repository packages.
This requires sdk.git Change-Id I6993d6c4 to build
(to enable the use of XSD v5).

Change-Id: If3beb09ae4eef3990caf661b2d4cfbdfd8a6f86a
2011-09-17 22:50:43 -07:00
Raphael
5dc10d55a4 Specify the full path to atree for the windows.atree. DO NOT MERGE.
Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.

Cherry-pick from master b2b5921

Change-Id: I13e532cdc4c0839b6fd7f2a3a149725940a02734
2011-09-16 21:38:13 -07:00
Raphael
bc16220756 Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
This moves the copy/strip/rm logic for the Windows SDK
from the patch_windows_sdk.sh to a regular sdk-windows-x86.atree.

The bash script is still here to invoke atree and do whatever
cleanup we might want to do later.

This should make it easier to maintain the Windows SDK
by providing a structure similar to tools.atree.

This change requires build.git Change-Id: I22aae7a8 to
have rm/strip support in atree.

Cherry-pick from master e07f59a

Change-Id: Ia71fc69717eaee6e4d8d062144347db3326e4127
2011-09-16 21:38:03 -07:00
Raphael
f31a96aa9f SDK packaging for unified llvm-rs-cc binary.
Change-Id: I73971ade5bddadd2f395d098e5a083a6f683c302
2011-09-08 16:42:12 -07:00
Raphael
effacceabd am eae54028: am 0221f2d8: am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
* commit 'eae54028c2d763c4edd7129f5d9b91d6541b6dea':
  Package the 2 llvm-rs-cc versions in the Windows SDK.
2011-06-23 14:31:19 -07:00