Commit Graph

24 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
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
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
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
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
a85a93fdb0 SDK: correctly zip sources.zip package.
When building the sources.zip for the SDK Repository,
the --exec-zip argument seems to be have been lost with
recent merges. Without this flag, the sources.zip is
not valid on some platforms.

Change-Id: I589df3d6df7890e0fccf568a03a76e6985ecb534
2012-03-27 10:49:58 -07:00
Raphael Moll
9516dc5aa1 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-02-29 15:57:41 -08:00
Raphael
d79eab5a39 SDK: source.properties templates.
This adds support for "templates" source.properties files that can
inherit the platform version/codename/api level from the build.

The purpose is for a given build to always generate SDK files that
match the platform generated in the same branch.

Change-Id: Id623bbef45a04d953da8eade7e8c34c77709f9c3
2011-11-15 16:56:17 -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
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
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
Raphael
2ff496b8a1 Build SDK repository.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I01c729eff4dbc1eccbc7c5b1869f329363f1ce07
2011-02-16 20:25:43 -08:00