Commit Graph

17 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
b06504185e SDK: Ability to generate repos in XSD repository-7.
Change-Id: Idc4c75a99625342128e59ea06fe8d30c5b2f56b7
2012-05-10 23:24:19 -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
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
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
48023786cf Generate SDK Repository XML.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Change-Id: Ibaad66f4b1cc476a4146afde7087a10a0557f74c
2011-03-18 13:35:03 -07:00