Commit graph

23 commits

Author SHA1 Message Date
Ying Wang
5d88770f26 Don't run ziptime on host zip files.
ziptime fails on zip file larger than 2GB.
These zip files won't installed on device and we don't care that much
about their reprodudcibility across builds.

Change-Id: I47062928d075a59eda92dd5333e59502f490d1cb
2015-11-04 10:06:25 -08:00
Dan Willemsen
48a621c277 Remove changing uids/timestamps from zip/jar files
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.

Add a new tool, ziptime, that uses a very stripped down copy of
zipalign. It no longer depends on libandroidfw, and now rewrites the
timestamps in place instead of making a copy of the zipfile. This should
improve speed and reduce disk requirements, especially with the large
packaging zip files.

Bug: 24201956
Change-Id: I50f68669f659da1b4393e964ad40b6aafb00c1e7
2015-11-02 14:51:54 -08:00
Dan Willemsen
b589ae4e26 Revert "Remove changing uids/timestamps from zip/jar files"
This reverts commit 3c2c064c87.

zipalign depends on libandroidfw, and some setups don't include frameworks/base.

Bug: 24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
2015-10-29 21:26:18 +00:00
Dan Willemsen
3c2c064c87 Remove changing uids/timestamps from zip/jar files
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.

Add a new option to zipalign, -t, to replace all timestamps with static
timestamps (2008 Jan 1 00:00:00). Use this for all non-APK zip files.
APK zip timestamps are set based on the certificate date in SignApk.

Bug: 24201956
Change-Id: Ifb619fc499ba9d99fc624f2acd5f8de36d78ef8e
2015-10-29 11:57:16 -07:00
Raphael Moll
a4d1f6a7f0 SDK Addon multi-sys-img support.
Fix an issue where the add-on system images have 2 extra
inner folders. The sole root folder in the zip file should
be the ABI one.

Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
2014-10-10 00:50:39 +00:00
Raphael Moll
0d7d09ae04 SDK Addon multi-sys-img support, part 4.
Change the add-on build rules to packages the system-image
separately from the main add-on zip file. This is then picked
up by development's sdk_repo.mk to generate two repository
packages files (one for the add-on, one for its system image.)

The system-image now also contains a source.propertie file,
which value is not infered from the add-on's manifest.ini

Add-on product files need to be modified to define a
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP variable that points
to their source.properties or source.prop_template file.

Change-Id: I79e9cdfd43c99f099a70890fb3e5e9215ad647f4
2014-08-27 09:35:07 -07:00
Marius Renn
b1df701ed8 Google Add-On API Documentation Fixes (5429077)
We no longer want a reference directory, but rather
maps_api and effects_api directories.

Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
2011-11-23 18:08:51 -08:00
Ying Wang
a032d3d073 Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00
David 'Digit' Turner
2f2882a04e am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-22 23:01:17 -07:00
David 'Digit' Turner
041fb639bf sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
This patch fixes the broken builds for PRODUCT-google_sdk-sdk_addon
and PRODUCT-google_sdk_x86-sdk_addon.

Change-Id: Iba0f23a03c143cd38aaba98b0bd0d52686330ed6
2011-08-31 00:43:07 +02:00
David 'Digit' Turner
d19750e87f am 36331f84: resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp
* commit '36331f8455822539fe4fbb0a25fbc377bbc80a89': (23 commits)
  sdk-addon.mk: Copy image files to ABI-specific dir
  emulator: Enable dex-preoptimization
  sdk: provide ABI-dependent atree files
  emulator: Build emulator platform images as ARMv7-A
  x86: Add proper gcc-4.4.3 x86 toolchain support.
  sdk: Add pc-bios files for IA qemu emulator
  x86: qemu emulator is the default build target
  Add full_x86 product.
  x86: sdk_x86 build target
  Minor cleanup - DO NOT MERGE
  Clean up full config - DO NOT MERGE
  Make a full list of locales available
  Truly default to the full config.
  generic_x86 builds don't need/use the sparse ext4 format.
  Use ext4 file system for generic_x86 userdata partition
  GB Updates for init.rc and boot command line
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
  Display the TARGET_ARCH_VARIANT
  Add generic_x86-eng to the lunch menu
  Move buildspec vars to BoardConfig.mk
  ...
2011-07-11 11:55:35 -07:00
David 'Digit' Turner
9fb131a9b6 sdk-addon.mk: Copy image files to ABI-specific dir
Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
2011-07-08 01:56:51 +02:00
Ying Wang
a9be570b5d resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp
Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
2011-03-31 18:05:37 -07:00
Ying Wang
fdc3192e68 resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
2011-03-31 17:00:13 -07:00
Raphael
9b4660a1c6 resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
2011-03-25 15:13:55 -07:00
Raphael
bd0c91c8b9 Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
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: I863ac8baf159432d7c95df46cba6e4f3b9122629
2011-03-24 13:41:35 -07:00
Bruce Beare
18a130e98a x86: qemu emulator is the default build target
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-15 07:47:48 -07:00
Raphael
3e54830dc8 Fix for SDK repository.
Change-Id: Ia1245226c451ed4539a0a0cd51022a3325f4b33b
2011-02-23 22:34:16 -08:00
Raphael
c4d4731b4d 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: Ie7e0f789bafd73d5ee2461349155a6e562e2edd9
2011-02-16 20:27:59 -08:00
Raphael
843c6e2530 merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
2011-02-04 12:34:54 -08:00
Raphael
30e0707531 SDK: stub the maps.jar from the google_apis addon.
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
2011-02-03 23:00:49 -08:00
Joe Onorato
eb19b3e0d1 AI 146003: am: CL 145850 am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146003
2009-04-13 16:32:16 -07:00
Joe Onorato
214a42bbb6 AI 145655: am: CL 145618 am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145655
2009-04-09 20:36:06 -07:00