Commit Graph

6592 Commits

Author SHA1 Message Date
Dan Albert
21ba3a3b66 am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:54:43 +00:00
Dan Albert
3a4ae05422 am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:50:08 +00:00
Dan Albert
3594f5f0ed am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '9979ae4370e7acd4b305fddeca3c24495214a0cf':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
2014-10-01 20:39:56 +00:00
Ying Wang
114a0fca3b Convert comma in split arguments to underscore.
aapt already does so.
Bug: 16947729

Change-Id: I813fb8cf41b3ec836e6e6d5f68af12dc385169f8
2014-10-01 12:01:04 -07:00
Ying Wang
89ec798796 Add split apks to the cts package.
With split apk support, we may have multilple installed files for a
module. Use ALL_MODULES.$(module).BUILT_INSTALLED to make sure get
every split apk included.

Bug: 16947729
Change-Id: I4e41c2586f1b25f4810b67cd1e948aba0cbcf97b
2014-10-01 11:46:30 -07:00
Dan Albert
2251ea40ba Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4
2014-10-01 10:12:25 -07:00
Ying Wang
5e56cf4902 am 2f983643: am 6bef5124: am fc6d5b6a: Allow to add jar resource or manifest even without Java code.
* commit '2f983643925ad61988264b6c6ff8657dd7c2cbfa':
  Allow to add jar resource or manifest even without Java code.
2014-10-01 17:08:24 +00:00
Ying Wang
48cc9fc4eb am 9a62f7d0: am 2a8015fa: am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit '9a62f7d013f9de537b262cb3154aef24090fe1b0':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-10-01 17:08:23 +00:00
Chet Haase
4f7ce5807f am fd1d586e: am c533fa98: am f388993a: Add docs for Palette and CardView
* commit 'fd1d586ef8c90a7688f7df68b00199ce3b77a536':
  Add docs for Palette and CardView
2014-10-01 17:08:22 +00:00
Ying Wang
2f98364392 am 6bef5124: am fc6d5b6a: Allow to add jar resource or manifest even without Java code.
* commit '6bef5124b7199900286ca199cd1fa22d12e27051':
  Allow to add jar resource or manifest even without Java code.
2014-10-01 17:03:54 +00:00
Ying Wang
9a62f7d013 am 2a8015fa: am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit '2a8015fad6b45f5adbcf0fc744502109c902bf76':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-10-01 17:03:53 +00:00
Chet Haase
fd1d586ef8 am c533fa98: am f388993a: Add docs for Palette and CardView
* commit 'c533fa98316de420bd6a5eec643fad7bc0f1d81d':
  Add docs for Palette and CardView
2014-10-01 17:03:53 +00:00
Ying Wang
6bef5124b7 am fc6d5b6a: Allow to add jar resource or manifest even without Java code.
* commit 'fc6d5b6a947fa80061778639290c0241b93635b4':
  Allow to add jar resource or manifest even without Java code.
2014-10-01 15:16:46 +00:00
Ying Wang
2a8015fad6 am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit 'c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-10-01 15:16:46 +00:00
Chet Haase
c533fa9831 am f388993a: Add docs for Palette and CardView
* commit 'f388993a8f5690cef3ea65f6982e343c53e96941':
  Add docs for Palette and CardView
2014-10-01 15:16:45 +00:00
Ying Wang
1c869bc536 am fc6d5b6a: Allow to add jar resource or manifest even without Java code.
* commit 'fc6d5b6a947fa80061778639290c0241b93635b4':
  Allow to add jar resource or manifest even without Java code.
2014-10-01 01:48:43 +00:00
Ying Wang
fc6d5b6a94 Allow to add jar resource or manifest even without Java code.
Change-Id: I2d8fd93f004d9e0c29c71b887810b2624769789e
2014-09-30 17:32:58 -07:00
Tim Murray
2e5b902ed4 am b7c92e14: am 35dd358c: Merge "Update prebuilt RS clcore location."
* commit 'b7c92e14f3c55b07ce17d96375781e434e5d3f1a':
  Update prebuilt RS clcore location.
2014-09-30 23:52:13 +00:00
Chih-Hung Hsieh
eca4ce832e am 14012488: am 09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."
* commit '140124884050264721e22cb08f713a7da76b36d4':
  Clear all LOCAL_CLANG_*FLAGS*.
2014-09-30 23:52:08 +00:00
Tim Murray
6b80bbc30a am 94c69b5d: am b7c92e14: am 35dd358c: Merge "Update prebuilt RS clcore location."
* commit '94c69b5d6564e77e20e4877b40a29b01628e5820':
  Update prebuilt RS clcore location.
2014-09-30 22:53:15 +00:00
Tim Murray
94c69b5d65 am b7c92e14: am 35dd358c: Merge "Update prebuilt RS clcore location."
* commit 'b7c92e14f3c55b07ce17d96375781e434e5d3f1a':
  Update prebuilt RS clcore location.
2014-09-30 22:46:55 +00:00
Tim Murray
b7c92e14f3 am 35dd358c: Merge "Update prebuilt RS clcore location."
* commit '35dd358cc4fccb062bd90cb1f9404a582b4facd4':
  Update prebuilt RS clcore location.
2014-09-30 22:40:39 +00:00
Tim Murray
35dd358cc4 Merge "Update prebuilt RS clcore location." 2014-09-30 22:34:59 +00:00
Chih-Hung Hsieh
688bce90f5 am 0a378874: am 14012488: am 09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."
* commit '0a37887412ee42abbcb8ad63dc65253e3a05a6a7':
  Clear all LOCAL_CLANG_*FLAGS*.
2014-09-30 22:18:11 +00:00
Chih-Hung Hsieh
0a37887412 am 14012488: am 09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."
* commit '140124884050264721e22cb08f713a7da76b36d4':
  Clear all LOCAL_CLANG_*FLAGS*.
2014-09-30 22:14:06 +00:00
Chih-Hung Hsieh
1401248840 am 09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."
* commit '09cdd5000caed13a135d3ff62972e002904208c3':
  Clear all LOCAL_CLANG_*FLAGS*.
2014-09-30 22:08:51 +00:00
Tim Murray
00fa757d7d Update prebuilt RS clcore location.
Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
2014-09-30 15:08:03 -07:00
Chih-Hung Hsieh
78b6cea65e Clear all LOCAL_CLANG_*FLAGS*.
Although only some of these flags will be used for some
targets or hosts, they must all be cleared to avoid carrying
over from one project to another.

BUG: 17677366
Change-Id: I6d26fa7e5bf2ff11758728810d4874f3759aebe7
2014-09-30 21:50:58 +00:00
Ying Wang
912eb7155b am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit 'c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-09-30 16:50:04 +00:00
Chet Haase
3577874dc1 am f388993a: Add docs for Palette and CardView
* commit 'f388993a8f5690cef3ea65f6982e343c53e96941':
  Add docs for Palette and CardView
2014-09-30 16:50:04 +00:00
Ying Wang
c168b6e27a Merge "the recovery image also needs to be signed with $(BOOT_SIGNER)" into lmp-dev 2014-09-30 16:41:08 +00:00
Stephen Hines
dc64c7b460 Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Bug: 14416410

prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".

Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
2014-09-30 02:38:41 -07:00
Stephen Hines
b34b7aeb31 Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
Bug: 14416410
Change-Id: Ife2d7329795f229adcddc5c57b20aa96c56387c0
2014-09-30 02:37:20 -07:00
Ying Wang
c9bdde8213 am f3ab8702: am a953de3f: am 326363b8: Merge "java_alternative_checked_module takes precedence."
* commit 'f3ab87027d75ff8a4bfc8bc8d7444843c510f162':
  java_alternative_checked_module takes precedence.
2014-09-30 06:30:29 +00:00
Ying Wang
8cf237b8c9 am cbe67ed9: am 1d6f150e: am 8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE."
* commit 'cbe67ed918c92998868d1fe06d70c0f67de60197':
  Don't modify LOCAL_CHECKED_MODULE.
2014-09-30 06:30:28 +00:00
Ying Wang
f3ab87027d am a953de3f: am 326363b8: Merge "java_alternative_checked_module takes precedence."
* commit 'a953de3f01b3c3428e133b14bad0662b4adc901d':
  java_alternative_checked_module takes precedence.
2014-09-30 06:03:47 +00:00
Ying Wang
cbe67ed918 am 1d6f150e: am 8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE."
* commit '1d6f150e3e3cce1788d0aea47d0aa8bef0f6df66':
  Don't modify LOCAL_CHECKED_MODULE.
2014-09-30 06:03:30 +00:00
Ying Wang
dc050b7b98 am a953de3f: am 326363b8: Merge "java_alternative_checked_module takes precedence."
* commit 'a953de3f01b3c3428e133b14bad0662b4adc901d':
  java_alternative_checked_module takes precedence.
2014-09-30 04:17:12 +00:00
Ying Wang
a953de3f01 am 326363b8: Merge "java_alternative_checked_module takes precedence."
* commit '326363b82368efe5a99df558588d5b2f802fe604':
  java_alternative_checked_module takes precedence.
2014-09-30 00:24:30 +00:00
Ying Wang
8260562434 java_alternative_checked_module takes precedence.
java_alternative_checked_module takes precedence over
LOCAL_BUILT_MODULE.

Change-Id: I84f0d65dbc05f4686817aa835d003eb0101af146
2014-09-29 17:17:00 -07:00
Ying Wang
e4cd584e1b am 1d6f150e: am 8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE."
* commit '1d6f150e3e3cce1788d0aea47d0aa8bef0f6df66':
  Don't modify LOCAL_CHECKED_MODULE.
2014-09-29 22:49:31 +00:00
Ying Wang
1d6f150e3e am 8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE."
* commit '8d8560026a75aaa9e4abe7190a1dab3c4732767d':
  Don't modify LOCAL_CHECKED_MODULE.
2014-09-29 22:45:45 +00:00
Ying Wang
6c1d1cc712 Don't modify LOCAL_CHECKED_MODULE.
Use a temporary variable my_checked_module instead,
so that we don't override the 2nd_arch's checked module with the
1st_arch's in multilib build.
Note that by default we checkbuild 2nd_arch only for host modules,
but not for target modules.
We enable multlib for target modules by default, it would take too
much time to checkbuild for both archs. For 32-bit modules actually we
can checkbuild a 32-bit product.

Change-Id: I0a5ba75699225b7641442673483731a8fd360d61
2014-09-29 21:59:55 +00:00
Chih-Hung Hsieh
712378edc4 am 916a954d: am b9b2d21c: am 4a8d5c1a: Merge "Add local Clang+target specific flags."
* commit '916a954d8c0e925a022ec2fdd59096f405f866e2':
  Add local Clang+target specific flags.
2014-09-29 19:45:02 +00:00
Dan Albert
7df0e7a7c8 am 93785e27: am ec8815f9: am 91adf75c: Merge "Fix detection of C++ STL for tests."
* commit '93785e27932a2c9ec2b7eee64c7310fc2200a732':
  Fix detection of C++ STL for tests.
2014-09-29 19:44:56 +00:00
Ying Wang
c888b2d106 am 583ec9da: am e84eb7e3: am a6a6c35c: Return "none" if no matching arch found
* commit '583ec9da3e8d6d8ebf83fdba078cba2a0d24af5c':
  Return "none" if no matching arch found
2014-09-29 19:44:06 +00:00
Andrew Boie
194418c3e1 the recovery image also needs to be signed with $(BOOT_SIGNER)
Change-Id: Ie90976afdaada6410b1566fe497ce86ee935ad41
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Reviewed-on: https://android.intel.com/232319
2014-09-28 10:48:50 -07:00
Chet Haase
f388993a8f Add docs for Palette and CardView
These new v7 support lib APIs were never added to the make files to
allow docs to be build, so they don't appear in the reference docs.
Adding them to pathmap.mk fixes this.

Issue #17681531 Add docs for CardView and Palette

Change-Id: If9a4562c5e9629dc29791185dd720c6986c2b9a8
2014-09-28 16:13:19 +00:00
Chih-Hung Hsieh
916a954d8c am b9b2d21c: am 4a8d5c1a: Merge "Add local Clang+target specific flags."
* commit 'b9b2d21c04d0ba65ad56a26f8306e9afa7d99694':
  Add local Clang+target specific flags.
2014-09-27 03:00:29 +00:00
Chih-Hung Hsieh
1184754c22 am b9b2d21c: am 4a8d5c1a: Merge "Add local Clang+target specific flags."
* commit 'b9b2d21c04d0ba65ad56a26f8306e9afa7d99694':
  Add local Clang+target specific flags.
2014-09-27 02:59:47 +00:00