Commit graph

8478 commits

Author SHA1 Message Date
Dirk Dougherty
79736c72c2 am 7d114b19: doc change: assets for play
* commit '7d114b195d2224ba8c6f8e156467b969317e0bf9':
  doc change: assets for play
2012-03-05 21:39:25 -08:00
Dirk Dougherty
74f072a447 am 7d114b19: doc change: assets for play
* commit '7d114b195d2224ba8c6f8e156467b969317e0bf9':
  doc change: assets for play
2012-03-05 21:39:00 -08:00
Dirk Dougherty
7d114b195d doc change: assets for play
Change-Id: I58647fd0059c5de54dd7665527a73f61e0d2dd32
2012-03-05 21:36:28 -08:00
Mathias Agopian
fb956ef9cc update include paths to new location
Change-Id: I13dfa74f35ee778615cdb9459fc2e18bc37d62a1
2012-03-05 18:45:37 -08:00
Mathias Agopian
6d40595e53 Merge "add a name for opengl tests include paths" 2012-03-05 16:08:15 -08:00
Mathias Agopian
bd118e684d add frameworks/native include paths
Change-Id: I1ede8075dc77f77f5a9bc4a53663d4a74842ab36
2012-03-05 16:04:31 -08:00
Mathias Agopian
cdcea7a83d add a name for opengl tests include paths
Change-Id: I4fd30376bcc9549da9391cde99b884eab305d5dd
2012-03-05 16:01:41 -08:00
The Android Open Source Project
5cb1fc0714 am ec3b4b72: am 719c9e02: Reconcile with ics-mr1-release
* commit 'ec3b4b725fc176a507e1da5156c4ff70f3cc8395':
2012-03-02 16:48:33 -08:00
The Android Open Source Project
ec3b4b725f am 719c9e02: Reconcile with ics-mr1-release
* commit '719c9e027297693d8874a4c3f8864387b9a93154':
2012-03-02 16:44:17 -08:00
The Android Open Source Project
719c9e0272 Reconcile with ics-mr1-release
Change-Id: I2484dad4a2ab183880aeede3685b6e0bae83ab82
2012-03-02 16:41:32 -08:00
The Android Open Source Project
7d0f0b562a am c8b150cf: am f1b829d1: Reconcile with ics-mr1-release
* commit 'c8b150cfc913c1c97e6205c571ef4a3a96fd2dd5':
  IMM62
2012-03-02 16:37:54 -08:00
The Android Open Source Project
c8b150cfc9 am f1b829d1: Reconcile with ics-mr1-release
* commit 'f1b829d19d71df2228a7af2a253877edeaa0f2f0':
  IMM62
2012-03-02 16:35:21 -08:00
The Android Open Source Project
f1b829d19d Reconcile with ics-mr1-release
Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e
2012-03-02 16:32:48 -08:00
Brian Muramatsu
23bb696870 Merge "Include CTS Build Rules" 2012-03-02 15:13:04 -08:00
Brian Muramatsu
7314933ac7 Include CTS Build Rules
Change-Id: Ieacee8ff6215b22222ea9ea6a1e62fce62daad77
2012-03-02 14:37:08 -08:00
Raphael Moll
3ab307a68c SDK: Also read sdk/build/tools.OS.atree
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

Change-Id: I9a1256548345fb866b0750fce6810913413dd946
2012-03-02 12:40:04 -08:00
The Android Automerger
081c50ffc5 IMM62 2012-03-02 11:55:21 -08:00
The Android Automerger
bcebabb5e8 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:49:21 -08:00
The Android Open Source Project
10cae8ecd8 am 70b0d157: am 0f03bad3: Reconcile with ics-mr1-release
* commit '70b0d157985cd47e858ae515f235bac779338440':
2012-03-01 16:46:20 -08:00
The Android Open Source Project
fe7293ff5e am 440370a6: am 2ab3572b: Reconcile with ics-mr1-release
* commit '440370a609a3170af14e9546d42a539206327335':
  IMM59
  IMM56D
  IMM56C
  IMM56B
  IMM56
2012-03-01 15:51:17 -08:00
The Android Open Source Project
70b0d15798 am 0f03bad3: Reconcile with ics-mr1-release
* commit '0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb':
2012-03-01 10:43:33 -08:00
The Android Open Source Project
0f03bad3fe Reconcile with ics-mr1-release
Change-Id: I33df3a369f056bd2369452fd056e0de355e6f9b4
2012-03-01 10:39:57 -08:00
The Android Open Source Project
440370a609 am 2ab3572b: Reconcile with ics-mr1-release
* commit '2ab3572ba3431e45b7dbedaa4573b00fa80826b2':
  IMM59
  IMM56D
  IMM56C
  IMM56B
  IMM56
2012-03-01 10:14:18 -08:00
The Android Open Source Project
2ab3572ba3 Reconcile with ics-mr1-release
Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9
2012-03-01 10:11:36 -08:00
Andrew Hsieh
bea6b97743 Merge "Use %zd instead of %d for variables of type ssize_t" 2012-02-29 12:19:45 -08:00
Andrew Hsieh
66a9842657 Merge "BUILD_HOST_64bit=1 to build host tools in 64-bit" 2012-02-29 12:19:26 -08:00
Steve Block
495e58502a Revert "Remove unused notice_files target"
This broke the PRODUCT-sdk-(win_)sdk target of SDK builds

This reverts commit 620a5270fc.

Change-Id: I81afe68ae98b5daac5fe136ec8d04f6fba5af9b4
2012-02-29 20:09:09 +00:00
Steve Block
620a5270fc Remove unused notice_files target
The notice_files target generates $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt and
$(TARGET_OUT_INTERMEDIATES)/NOTICE.html. The former is not needed and the
latter is an explicit dependency of $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz.
We can therefore remove the target and the logic to generate NOTICE.txt.

Change-Id: I6179c049bebe590c7298e8be0a30e30265423468
2012-02-29 16:00:58 +00:00
The Android Automerger
067153c059 IMM59 2012-02-28 15:18:24 -08:00
The Android Automerger
0a759438e9 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:12:45 -08:00
Doug Zongker
1807e700a5 don't generate retouch commands in OTA scripts
Doing ASLR at OTA time is now obsolete; we can stop emitting this code
in OTA scripts.

Change-Id: I2bcf8ef0697ea5590120f89dcd302f273daf531e
2012-02-28 12:21:08 -08:00
Andrew Hsieh
ed6b815505 BUILD_HOST_64bit=1 to build host tools in 64-bit
By default we build tool in 32-bit.  This flag allow individual tool and its
dependencies to be built in 64-bit (eg. Emulator).  Fixes to resolve 64-bit
porting issues (in other git) will be submitted seperately.

Change-Id: I486cf7ddac727d3c374ed890857d497c3a69e598
2012-02-28 10:24:39 -08:00
The Android Automerger
17e1ba6b5d IMM56D 2012-02-27 16:10:34 -08:00
The Android Automerger
82118d78ac merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 16:09:47 -08:00
Andrew Hsieh
276053b291 Use %zd instead of %d for variables of type ssize_t
To generate correct 64-bit code (with -m64)

Change-Id: I7cd5e0c7e8bdcb9ea3bf73df0dcda55f1cb56eec
2012-02-27 16:06:00 -08:00
The Android Automerger
52ce071c40 IMM56C 2012-02-27 14:44:07 -08:00
The Android Automerger
dae73146eb merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 14:41:50 -08:00
The Android Automerger
8246e7fb0e IMM56B 2012-02-27 12:31:17 -08:00
The Android Automerger
e6e8cdf716 merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 12:28:07 -08:00
The Android Automerger
7a2051fd01 IMM56 2012-02-25 10:45:47 -08:00
The Android Automerger
8e86f0581c merge in ics-mr1-release history after reset to ics-mr1 2012-02-25 10:41:34 -08:00
The Android Open Source Project
3111751dd1 am 6b1dade9: am d58f3d2b: Reconcile with ics-mr1-release
* commit '6b1dade9c64196afc357d2843528b5efc826a262':
2012-02-24 14:11:34 -08:00
The Android Open Source Project
6b1dade9c6 am d58f3d2b: Reconcile with ics-mr1-release
* commit 'd58f3d2bc47015f7a55b88ff56850b9990689e22':
2012-02-24 14:09:27 -08:00
The Android Open Source Project
d58f3d2bc4 Reconcile with ics-mr1-release
Change-Id: Idc7bbf210376184867a6265475e34967c00b1315
2012-02-24 14:05:46 -08:00
The Android Open Source Project
7a284f20d3 am 0e7d7f5d: am 134c0348: Reconcile with ics-mr1-release
* commit '0e7d7f5da314c5114f47863f5cf68e2bfcd2566e':
  IMM54
2012-02-24 14:01:53 -08:00
The Android Open Source Project
0e7d7f5da3 am 134c0348: Reconcile with ics-mr1-release
* commit '134c0348f9643eff06e1d69f7a144a1870aa29e4':
  IMM54
2012-02-24 13:59:21 -08:00
The Android Open Source Project
134c0348f9 Reconcile with ics-mr1-release
Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497
2012-02-24 13:57:33 -08:00
Jean-Baptiste Queru
418027c87a am 41ab528f: am 99505268: am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '41ab528fe3533847fecddb0c6ee7884b17f35279':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:38:53 -08:00
Jean-Baptiste Queru
41ab528fe3 am 99505268: am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '9950526875f3b71c764a6d39623842e3c26416db':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:36:52 -08:00
Jean-Baptiste Queru
9950526875 am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '20b970e25227c4144c61d0d6108905616dc4f08b':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:32:08 -08:00