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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Also merges 3ea87ca65f
'Fix XMLNS detection in SDK Repo XSD files.'
to prevent a merge conflict later on.
Change-Id: Ic9832e71456d76f849406e641792f4285ffbf649
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
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
This removes the test that makes the SDK only strip llvm-rs-cc.exe if present.
It means the SDK will FAIL if llvm-rs-cc wasn't build successfully for Windows.
Change-Id: I4c73954c30265e71e84916976f16ae76d67a8e13
Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.
Next the shell script is changed to make any error fatal and actually
break the build, like it should.
In the makefile, merge Ying's fix to correctly pass showcommands.
Change-Id: Iee75e42b0b0bbba3c26858c82c933660dc6d74ae
