OSDN Git Service

android-x86/build.git
9 years agoam 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has...
Nick Kralevich [Thu, 9 Apr 2015 00:31:57 +0000 (00:31 +0000)]
am 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

* commit '801411daca44a46338d8fa5e9015b85d94ecb471':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.

9 years agoam 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master
Ying Wang [Thu, 9 Apr 2015 00:31:56 +0000 (00:31 +0000)]
am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master

* commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3':
  Better way to package up the otatools-package.

9 years agoam 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
Nick Kralevich [Wed, 8 Apr 2015 23:27:14 +0000 (23:27 +0000)]
am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

* commit '6d08a0d3fc108f80db47541b0ecbb89e99a99260':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.

9 years agoresolved conflicts for merge of f5b9830b to stage-aosp-master
Ying Wang [Wed, 8 Apr 2015 23:21:58 +0000 (16:21 -0700)]
resolved conflicts for merge of f5b9830b to stage-aosp-master

Change-Id: I2eaab6ce59ee2dd89b89259f409bfff6180c89d3

9 years agoMerge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."
Nick Kralevich [Wed, 8 Apr 2015 22:50:03 +0000 (22:50 +0000)]
Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

9 years agoMerge "Better way to package up the otatools-package."
Ying Wang [Wed, 8 Apr 2015 20:53:45 +0000 (20:53 +0000)]
Merge "Better way to package up the otatools-package."

9 years agoBetter way to package up the otatools-package.
Ying Wang [Wed, 8 Apr 2015 19:24:37 +0000 (12:24 -0700)]
Better way to package up the otatools-package.

With this, you can easily add more executables, jars or shared libraries
to the package. Also now it automatically takes care of
32-bit-v.s.-64-bit library issue.

Change-Id: I5afe00fadc978d0da229b192eca1a4b1c149764e

9 years agoAndroidConfig.h: ensure HAVE_MALLOC_H always has a value.
Nick Kralevich [Wed, 8 Apr 2015 19:21:54 +0000 (12:21 -0700)]
AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.

Some programs (cough sqlite cough) do an improper check to see if
HAVE_MALLOC_H is defined. Instead of defining it with no value,
define it with a value so those checks pass.

Needed for bug: 20099586

Change-Id: I4c293b2c1b5f4caad85ffc1fc34ac385bab23f5c

9 years agoam bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071
Mark Salyzyn [Tue, 7 Apr 2015 16:58:02 +0000 (16:58 +0000)]
am bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071

* commit 'bf2474fba4dc446b4b580f4122d172e011c24ba1':
  fs_get_stats: add logging
  fs_config: add logging

9 years agoam 011a50e4: Merge changes I75d472ed,I6d681071
Mark Salyzyn [Tue, 7 Apr 2015 16:47:54 +0000 (16:47 +0000)]
am 011a50e4: Merge changes I75d472ed,I6d681071

* commit '011a50e4e1cc7371d8fbd0ea08002241fe54a675':
  fs_get_stats: add logging
  fs_config: add logging

9 years agoMerge changes I75d472ed,I6d681071
Mark Salyzyn [Tue, 7 Apr 2015 16:40:05 +0000 (16:40 +0000)]
Merge changes I75d472ed,I6d681071

* changes:
  fs_get_stats: add logging
  fs_config: add logging

9 years agofs_get_stats: add logging
Mark Salyzyn [Tue, 7 Apr 2015 16:19:27 +0000 (09:19 -0700)]
fs_get_stats: add logging

libcutils fs_config has the right to add Android logging

Bug: 19908228
Change-Id: I75d472ed142e32959cec78bf7babbf39d2b66cd2

9 years agofs_config: add logging
Mark Salyzyn [Tue, 7 Apr 2015 16:18:30 +0000 (09:18 -0700)]
fs_config: add logging

libcutils fs_config has the right to add Android logging

Bug: 19908228
Change-Id: I6d68107156962a6fec357ab99d23960c6852b026

9 years agoam f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"
Ying Wang [Sat, 4 Apr 2015 21:20:52 +0000 (21:20 +0000)]
am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit 'f994458babc78670263085b027bfaa34ff0bc52a':
  Include vendorsetup scripts in order

9 years agoam b4b996a8: Merge "Include vendorsetup scripts in order"
Ying Wang [Sat, 4 Apr 2015 21:10:43 +0000 (21:10 +0000)]
am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit 'b4b996a8ee26553e29f7610f97041753ddff3e68':
  Include vendorsetup scripts in order

9 years agoMerge "Include vendorsetup scripts in order"
Ying Wang [Sat, 4 Apr 2015 21:03:32 +0000 (21:03 +0000)]
Merge "Include vendorsetup scripts in order"

9 years agoam aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."
Ying Wang [Sat, 4 Apr 2015 01:29:29 +0000 (01:29 +0000)]
am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."

* commit 'aacc8bb4efb993e1d5ae539aa154c60d84a926dc':
  Convert bc depfiles to .P files.

9 years agoam 18ecae31: Merge "Convert bc depfiles to .P files."
Ying Wang [Sat, 4 Apr 2015 01:19:52 +0000 (01:19 +0000)]
am 18ecae31: Merge "Convert bc depfiles to .P files."

* commit '18ecae31e62365d658406ff33a93358beeb87553':
  Convert bc depfiles to .P files.

9 years agoMerge "Convert bc depfiles to .P files."
Ying Wang [Sat, 4 Apr 2015 01:09:55 +0000 (01:09 +0000)]
Merge "Convert bc depfiles to .P files."

9 years agoConvert bc depfiles to .P files.
Ying Wang [Fri, 3 Apr 2015 23:15:28 +0000 (16:15 -0700)]
Convert bc depfiles to .P files.

So you don't need clean step when a header file gets moved or deleted.

Change-Id: Iec0d63b89ba17c4ef0ad75f4a52b6759f2bff58a

9 years agoam 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
Elliott Hughes [Fri, 3 Apr 2015 22:23:06 +0000 (22:23 +0000)]
am 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."

* commit '7616909b5e24289eb7caecb4708f0c69a09a26f9':
  There's no such thing as _THREAD_SAFE.

9 years agoam 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."
Elliott Hughes [Fri, 3 Apr 2015 22:05:32 +0000 (22:05 +0000)]
am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."

* commit '519751a88217e6fdc3b86979ffaf61ff03d92312':
  There's no such thing as _THREAD_SAFE.

9 years agoMerge "There's no such thing as _THREAD_SAFE."
Elliott Hughes [Fri, 3 Apr 2015 21:55:06 +0000 (21:55 +0000)]
Merge "There's no such thing as _THREAD_SAFE."

9 years agoThere's no such thing as _THREAD_SAFE.
Elliott Hughes [Fri, 3 Apr 2015 20:41:10 +0000 (13:41 -0700)]
There's no such thing as _THREAD_SAFE.

At least, as far as I can tell from the internet and from grep in /usr/include
on a Mac.

Change-Id: I7f39bb2013db88e59f604e4491344d0d342e5f0b

9 years agoam d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
Elliott Hughes [Fri, 3 Apr 2015 20:40:54 +0000 (20:40 +0000)]
am d9ac3e9a: am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."

* commit 'd9ac3e9ad6079cf402e5c6895d54e0b3e3e2c455':
  Remove HAVE_PRINTF_ZD.

9 years agoam 97bcf915: Merge "Remove HAVE_PRINTF_ZD."
Elliott Hughes [Fri, 3 Apr 2015 20:30:45 +0000 (20:30 +0000)]
am 97bcf915: Merge "Remove HAVE_PRINTF_ZD."

* commit '97bcf915ad005a4baeb981ed8da09ab219973b1f':
  Remove HAVE_PRINTF_ZD.

9 years agoMerge "Remove HAVE_PRINTF_ZD."
Elliott Hughes [Fri, 3 Apr 2015 20:16:21 +0000 (20:16 +0000)]
Merge "Remove HAVE_PRINTF_ZD."

9 years agoRemove HAVE_PRINTF_ZD.
Elliott Hughes [Fri, 3 Apr 2015 20:05:53 +0000 (13:05 -0700)]
Remove HAVE_PRINTF_ZD.

Change-Id: Ie7677e4816ad886c13a8ac869e7c7342082a350f

9 years agoam 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY."
Elliott Hughes [Fri, 3 Apr 2015 19:59:00 +0000 (19:59 +0000)]
am 5d375b92: am dbaee628: Merge "Remove HAVE_STRLCPY."

* commit '5d375b92fcedd9db052eb0ed3834361002e7699f':
  Remove HAVE_STRLCPY.

9 years agoam dbaee628: Merge "Remove HAVE_STRLCPY."
Elliott Hughes [Fri, 3 Apr 2015 19:48:11 +0000 (19:48 +0000)]
am dbaee628: Merge "Remove HAVE_STRLCPY."

* commit 'dbaee628ec6a8215b59db66dac86846e6481263a':
  Remove HAVE_STRLCPY.

9 years agoMerge "Remove HAVE_STRLCPY."
Elliott Hughes [Fri, 3 Apr 2015 19:42:05 +0000 (19:42 +0000)]
Merge "Remove HAVE_STRLCPY."

9 years agoam c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
Ying Wang [Fri, 3 Apr 2015 17:15:06 +0000 (17:15 +0000)]
am c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."

* commit 'c35e7902679caf85d4295eca423b5df3dccaf79d':
  Move the inclusion of depfile to where it's generated.

9 years agoam 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
Ying Wang [Fri, 3 Apr 2015 17:04:29 +0000 (17:04 +0000)]
am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."

* commit '555b7770fef6024ac6fe4e580f8a8d1663ceb001':
  Move the inclusion of depfile to where it's generated.

9 years agoMerge "Move the inclusion of depfile to where it's generated."
Ying Wang [Fri, 3 Apr 2015 16:54:54 +0000 (16:54 +0000)]
Merge "Move the inclusion of depfile to where it's generated."

9 years agoMove the inclusion of depfile to where it's generated.
Ying Wang [Fri, 3 Apr 2015 16:53:41 +0000 (09:53 -0700)]
Move the inclusion of depfile to where it's generated.

Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38

9 years agoam 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there are no device...
Ying Wang [Fri, 3 Apr 2015 16:14:37 +0000 (16:14 +0000)]
am 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"

* commit '6fe4ab94878c7fd96ca41ac93c0684ba86e10a45':
  Don't fail build of otatools if there are no device certificates

9 years agoam 58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"
Ying Wang [Fri, 3 Apr 2015 16:04:43 +0000 (16:04 +0000)]
am 58912c87: Merge "Don\'t fail build of otatools if there are no device certificates"

* commit '58912c874bff05e3e76ccc7b7907f628ed010bf5':
  Don't fail build of otatools if there are no device certificates

9 years agoMerge "Don't fail build of otatools if there are no device certificates"
Ying Wang [Fri, 3 Apr 2015 15:57:57 +0000 (15:57 +0000)]
Merge "Don't fail build of otatools if there are no device certificates"

9 years agoInclude vendorsetup scripts in order
Oleksiy Avramchenko [Mon, 6 Oct 2014 16:51:58 +0000 (18:51 +0200)]
Include vendorsetup scripts in order

This fixes randomness of the combo index.

Change-Id: I533161fea8d1bc0c9dbd6ca2f3393d27310c9588

9 years agoam 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
Ying Wang [Fri, 3 Apr 2015 01:19:10 +0000 (01:19 +0000)]
am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"

* commit '20fa9a8e65cd84cabc563f87839706d9f7308a8f':
  Use PRIVATE_ALL_OBJECTS

9 years agoam 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"
Ying Wang [Fri, 3 Apr 2015 01:11:22 +0000 (01:11 +0000)]
am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"

* commit '62003acdcc2ecdc13ce2a9880c35147d2070e865':
  Use PRIVATE_ALL_OBJECTS

9 years agoMerge "Use PRIVATE_ALL_OBJECTS"
Ying Wang [Fri, 3 Apr 2015 01:03:50 +0000 (01:03 +0000)]
Merge "Use PRIVATE_ALL_OBJECTS"

9 years agoUse PRIVATE_ALL_OBJECTS
Ying Wang [Fri, 3 Apr 2015 01:02:33 +0000 (18:02 -0700)]
Use PRIVATE_ALL_OBJECTS

Instead of the dirty $(filter) call.

Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005

9 years agoRemove HAVE_STRLCPY.
Elliott Hughes [Thu, 2 Apr 2015 23:43:52 +0000 (16:43 -0700)]
Remove HAVE_STRLCPY.

Change-Id: I27864a9075183de5bd83569d53a00fc2f53c96df

9 years agoam ead61626: am ced6159b: Merge "Filter out gcc flags that are not recognized by...
Chih-Hung Hsieh [Thu, 2 Apr 2015 22:35:34 +0000 (22:35 +0000)]
am ead61626: am ced6159b: Merge "Filter out gcc flags that are not recognized by clang."

* commit 'ead6162694de41e3fa611be1cd1d615b31c2919c':
  Filter out gcc flags that are not recognized by clang.

9 years agoam ced6159b: Merge "Filter out gcc flags that are not recognized by clang."
Chih-Hung Hsieh [Thu, 2 Apr 2015 22:28:30 +0000 (22:28 +0000)]
am ced6159b: Merge "Filter out gcc flags that are not recognized by clang."

* commit 'ced6159b7e5551fcd3f64c21b7807c7555f80f73':
  Filter out gcc flags that are not recognized by clang.

9 years agoMerge "Filter out gcc flags that are not recognized by clang."
Chih-Hung Hsieh [Thu, 2 Apr 2015 22:13:16 +0000 (22:13 +0000)]
Merge "Filter out gcc flags that are not recognized by clang."

9 years agoFilter out gcc flags that are not recognized by clang.
Chih-Hung Hsieh [Thu, 2 Apr 2015 21:42:20 +0000 (14:42 -0700)]
Filter out gcc flags that are not recognized by clang.

Change-Id: I04e95fc3b0cb2825bf90a55916f89d25fa9fc475

9 years agoam 496c4eb6: am 6ac0d474: Merge "fs_config: move fs_config to libcutils"
Mark Salyzyn [Thu, 2 Apr 2015 21:21:45 +0000 (21:21 +0000)]
am 496c4eb6: am 6ac0d474: Merge "fs_config: move fs_config to libcutils"

* commit '496c4eb6a3db26ce307eff2d9be090e1c85f8639':
  fs_config: move fs_config to libcutils

9 years agoam 47437817: am 62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"
Mark Salyzyn [Thu, 2 Apr 2015 21:21:44 +0000 (21:21 +0000)]
am 47437817: am 62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"

* commit '474378176900f93d2b460e7570a7944d7c196f52':
  fs_get_stats: move fs_config to libcutils

9 years agoam 6ac0d474: Merge "fs_config: move fs_config to libcutils"
Mark Salyzyn [Thu, 2 Apr 2015 21:09:41 +0000 (21:09 +0000)]
am 6ac0d474: Merge "fs_config: move fs_config to libcutils"

* commit '6ac0d47402855d199a1afd6bc5c7cd775a1cf5d1':
  fs_config: move fs_config to libcutils

9 years agoam 62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"
Mark Salyzyn [Thu, 2 Apr 2015 21:09:40 +0000 (21:09 +0000)]
am 62d7ccad: Merge "fs_get_stats: move fs_config to libcutils"

* commit '62d7ccad176ac1110a912d1cfe327e938c91bd59':
  fs_get_stats: move fs_config to libcutils

9 years agoMerge "fs_config: move fs_config to libcutils"
Mark Salyzyn [Thu, 2 Apr 2015 21:02:52 +0000 (21:02 +0000)]
Merge "fs_config: move fs_config to libcutils"

9 years agoMerge "fs_get_stats: move fs_config to libcutils"
Mark Salyzyn [Thu, 2 Apr 2015 21:00:05 +0000 (21:00 +0000)]
Merge "fs_get_stats: move fs_config to libcutils"

9 years agofs_config: move fs_config to libcutils
Mark Salyzyn [Wed, 1 Apr 2015 19:54:46 +0000 (12:54 -0700)]
fs_config: move fs_config to libcutils

Bug: 19908228
Change-Id: I4103ac395d0a28fd13173cc703e980aafe6c02e1

9 years agofs_get_stats: move fs_config to libcutils
Mark Salyzyn [Wed, 1 Apr 2015 19:56:19 +0000 (12:56 -0700)]
fs_get_stats: move fs_config to libcutils

Bug: 19908228
Change-Id: I668bf8e11b09ccc9c298382e54208f531844b0c5

9 years agoam da885b90: am 71d4c95f: Merge "Fix typo."
Ying Wang [Thu, 2 Apr 2015 20:07:52 +0000 (20:07 +0000)]
am da885b90: am 71d4c95f: Merge "Fix typo."

* commit 'da885b90e4c47a0e29597da185ec95a7e4e3a73c':
  Fix typo.

9 years agoam 71d4c95f: Merge "Fix typo."
Ying Wang [Thu, 2 Apr 2015 19:57:49 +0000 (19:57 +0000)]
am 71d4c95f: Merge "Fix typo."

* commit '71d4c95f83018199b8e79d0800dd2eca80b9f728':
  Fix typo.

9 years agoMerge "Fix typo."
Ying Wang [Thu, 2 Apr 2015 19:49:13 +0000 (19:49 +0000)]
Merge "Fix typo."

9 years agoFix typo.
Ying Wang [Thu, 2 Apr 2015 19:48:32 +0000 (12:48 -0700)]
Fix typo.

Change-Id: Ic934ed8610a4f03fbfb3d06dff4d911734a9d818

9 years agoam 347195da: am 6ddc3600: Merge "build_image.py: Verity support for flashing non...
Mohamad Ayyash [Thu, 2 Apr 2015 18:37:05 +0000 (18:37 +0000)]
am 347195da: am 6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"

* commit '347195da2ea801db95cf201fa7516bf392dc005a':
  build_image.py: Verity support for flashing non partition spanning fs

9 years agoam 6ddc3600: Merge "build_image.py: Verity support for flashing non partition spannin...
Mohamad Ayyash [Thu, 2 Apr 2015 18:25:53 +0000 (18:25 +0000)]
am 6ddc3600: Merge "build_image.py: Verity support for flashing non partition spanning fs"

* commit '6ddc3600659d4517c416ce3b06e4ccee14042030':
  build_image.py: Verity support for flashing non partition spanning fs

9 years agoam dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile."
Dan Albert [Thu, 2 Apr 2015 18:25:35 +0000 (18:25 +0000)]
am dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile."

* commit 'dc8d7092db0b2d5754931ae130da5b1790a7d670':
  Use prebuilt libclang_rt.profile.

9 years agoMerge "build_image.py: Verity support for flashing non partition spanning fs"
Mohamad Ayyash [Thu, 2 Apr 2015 18:18:21 +0000 (18:18 +0000)]
Merge "build_image.py: Verity support for flashing non partition spanning fs"

9 years agoam 0064c51e: Merge "Use prebuilt libclang_rt.profile."
Dan Albert [Thu, 2 Apr 2015 18:14:48 +0000 (18:14 +0000)]
am 0064c51e: Merge "Use prebuilt libclang_rt.profile."

* commit '0064c51efee452daae110eac99b1321c00652c17':
  Use prebuilt libclang_rt.profile.

9 years agoMerge "Use prebuilt libclang_rt.profile."
Dan Albert [Thu, 2 Apr 2015 18:05:20 +0000 (18:05 +0000)]
Merge "Use prebuilt libclang_rt.profile."

9 years agoDon't fail build of otatools if there are no device certificates
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates

Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6

9 years agoUse prebuilt libclang_rt.profile.
Dan Albert [Mon, 26 Jan 2015 00:20:57 +0000 (16:20 -0800)]
Use prebuilt libclang_rt.profile.

Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8

9 years agoam 18aad5fe: am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree...
Ying Wang [Wed, 1 Apr 2015 22:51:49 +0000 (22:51 +0000)]
am 18aad5fe: am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm."

* commit '18aad5fea1c1cf651a518d73bfb43e13fcad0a40':
  Return non-zero if can't locate top of the tree in m/mm/mmm.

9 years agoam 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm."
Ying Wang [Wed, 1 Apr 2015 22:41:38 +0000 (22:41 +0000)]
am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm."

* commit '24a71e1565d48d6b5f9cdbd12e4cb279ae7e18bb':
  Return non-zero if can't locate top of the tree in m/mm/mmm.

9 years agoMerge "Return non-zero if can't locate top of the tree in m/mm/mmm."
Ying Wang [Wed, 1 Apr 2015 22:31:15 +0000 (22:31 +0000)]
Merge "Return non-zero if can't locate top of the tree in m/mm/mmm."

9 years agoam 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved ident...
Stephen Hines [Wed, 1 Apr 2015 19:09:58 +0000 (19:09 +0000)]
am 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."

* commit '31f35975178e00c1178433bbbdefa0e27bee9750':
  Don't warn on definition of possibly reserved identifiers.

9 years agoam 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."
Stephen Hines [Wed, 1 Apr 2015 18:59:07 +0000 (18:59 +0000)]
am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."

* commit '9a98c47c64446e0c46f1d24f3d6526d177b62e14':
  Don't warn on definition of possibly reserved identifiers.

9 years agoMerge "Don't warn on definition of possibly reserved identifiers."
Stephen Hines [Wed, 1 Apr 2015 18:50:28 +0000 (18:50 +0000)]
Merge "Don't warn on definition of possibly reserved identifiers."

9 years agoam 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
Nick Kralevich [Wed, 1 Apr 2015 18:05:29 +0000 (18:05 +0000)]
am 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."

* commit '4e94ed11855e56ed498a2e7e83e312d5b691c5b9':
  Drop BOARD_SEPOLICY_UNION.

9 years agoam 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermedia...
Neil Fuller [Wed, 1 Apr 2015 18:05:28 +0000 (18:05 +0000)]
am 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"

* commit '2e4c67624c7f7d071d93d734cda024acea759582':
  Add explicit dependency on tzdata_updates_intermediates for CTS

9 years agoam 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."
Nick Kralevich [Wed, 1 Apr 2015 17:54:46 +0000 (17:54 +0000)]
am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."

* commit '2d47488e675d0eb839ae6a7f9544cc64c50c68d2':
  Drop BOARD_SEPOLICY_UNION.

9 years agoam 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
Neil Fuller [Wed, 1 Apr 2015 17:54:44 +0000 (17:54 +0000)]
am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"

* commit '2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
  Add explicit dependency on tzdata_updates_intermediates for CTS

9 years agoMerge "Drop BOARD_SEPOLICY_UNION."
Nick Kralevich [Wed, 1 Apr 2015 17:47:10 +0000 (17:47 +0000)]
Merge "Drop BOARD_SEPOLICY_UNION."

9 years agoMerge "Add explicit dependency on tzdata_updates_intermediates for CTS"
Neil Fuller [Wed, 1 Apr 2015 17:43:54 +0000 (17:43 +0000)]
Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"

9 years agoReturn non-zero if can't locate top of the tree in m/mm/mmm.
Ying Wang [Wed, 1 Apr 2015 17:13:02 +0000 (10:13 -0700)]
Return non-zero if can't locate top of the tree in m/mm/mmm.

Bug: 20017058
Change-Id: I85fac71061673d00a1b583ad13afc8567d794cd6

9 years agoam ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"
Tao Bao [Wed, 1 Apr 2015 17:15:29 +0000 (17:15 +0000)]
am ae26f5b0: am 53602955: Merge "Add support to sign bootable images with vboot_signer"

* commit 'ae26f5b002de956d495c4019b365040490ff18dd':
  Add support to sign bootable images with vboot_signer

9 years agoam 53602955: Merge "Add support to sign bootable images with vboot_signer"
Tao Bao [Wed, 1 Apr 2015 17:05:36 +0000 (17:05 +0000)]
am 53602955: Merge "Add support to sign bootable images with vboot_signer"

* commit '536029551d31d8084c444063349291781ee43ae1':
  Add support to sign bootable images with vboot_signer

9 years agoAdd explicit dependency on tzdata_updates_intermediates for CTS
Neil Fuller [Wed, 1 Apr 2015 17:02:46 +0000 (18:02 +0100)]
Add explicit dependency on tzdata_updates_intermediates for CTS

The build was working on AOSP, but fails downstream when using
Jack because the javalib.jar file needed by CTS is not being
built by default there.

Change-Id: I8dd836b33a4e1bae5af623db3822de99e9b05cf0

9 years agoam 071af0ac: am b8765797: Merge "Add unwinder linking to STL setup."
Dan Albert [Wed, 1 Apr 2015 16:59:48 +0000 (16:59 +0000)]
am 071af0ac: am b8765797: Merge "Add unwinder linking to STL setup."

* commit '071af0ac49ab87e4d365056a8ff764177f56b428':
  Add unwinder linking to STL setup.

9 years agoam 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
Dan Albert [Wed, 1 Apr 2015 16:59:46 +0000 (16:59 +0000)]
am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""

* commit '0ea16fcca3383bda04e873032d7721324ec90c42':
  Revert "Revert "Fix the libgcc/libatomic link order.""

9 years agoMerge "Add support to sign bootable images with vboot_signer"
Tao Bao [Wed, 1 Apr 2015 16:54:44 +0000 (16:54 +0000)]
Merge "Add support to sign bootable images with vboot_signer"

9 years agoam b8765797: Merge "Add unwinder linking to STL setup."
Dan Albert [Wed, 1 Apr 2015 16:49:11 +0000 (16:49 +0000)]
am b8765797: Merge "Add unwinder linking to STL setup."

* commit 'b8765797a89eebc97e38afcb94a965d69a8663ef':
  Add unwinder linking to STL setup.

9 years agoam 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""
Dan Albert [Wed, 1 Apr 2015 16:49:10 +0000 (16:49 +0000)]
am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""

* commit '60335c03d7e897267eb20e0b0a6c7c864fd08b43':
  Revert "Revert "Fix the libgcc/libatomic link order.""

9 years agoam 05b3468b: am 6c46e0bf: Show annotation documentation on class details
Jeff Arneson [Wed, 1 Apr 2015 16:47:13 +0000 (16:47 +0000)]
am 05b3468b: am 6c46e0bf: Show annotation documentation on class details

* commit '05b3468b1ea68450e4dc348c8b33a7eb3b34e7cc':
  Show annotation documentation on class details

9 years agoMerge "Add unwinder linking to STL setup."
Dan Albert [Wed, 1 Apr 2015 16:40:21 +0000 (16:40 +0000)]
Merge "Add unwinder linking to STL setup."

9 years agoMerge "Revert "Revert "Fix the libgcc/libatomic link order."""
Dan Albert [Wed, 1 Apr 2015 16:40:08 +0000 (16:40 +0000)]
Merge "Revert "Revert "Fix the libgcc/libatomic link order."""

9 years agoam 6c46e0bf: Show annotation documentation on class details
Jeff Arneson [Wed, 1 Apr 2015 16:33:27 +0000 (16:33 +0000)]
am 6c46e0bf: Show annotation documentation on class details

* commit '6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48':
  Show annotation documentation on class details

9 years agoAdd support to sign bootable images with vboot_signer
Tao Bao [Mon, 30 Mar 2015 06:07:41 +0000 (23:07 -0700)]
Add support to sign bootable images with vboot_signer

Add vboot properties to the dictionary file, which will be packed into
the target_files zip. Add support in packaging and OTA scripts to
sign the generated bootable images (boot.img and recovery.img) when
vboot is enabled.

Change-Id: I08758ced03d173219415bca762bbdb66c464a9f5
(cherry picked from commit 5d5a3bd9e8d8b14b71d1b2105417a2958d13d3d2)

9 years agoDrop BOARD_SEPOLICY_UNION.
Stephen Smalley [Wed, 1 Apr 2015 14:30:10 +0000 (10:30 -0400)]
Drop BOARD_SEPOLICY_UNION.

As suggested in the comments on
https://android-review.googlesource.com/#/c/141560/
drop BOARD_SEPOLICY_UNION and simplify the build_policy logic.
Union all files found under BOARD_SEPOLICY_DIRS.

Change-Id: I4214893c999c23631f5456cb1b8edd59771ef13b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
9 years agoAdd unwinder linking to STL setup.
Dan Albert [Tue, 31 Mar 2015 22:18:17 +0000 (15:18 -0700)]
Add unwinder linking to STL setup.

Previously we were bundling this into libc++ and having each binary
resolve its symbols from there. This means that the unwinder that gets
used for a given binary is sensitive to the order in which its
libraries are linked. Making this a static library dependency of each
binary means the right unwinder will always be used.

Bug: 18471342
Bug: 19958712
Change-Id: I782d212784dbf85355b5d9146d7460d675259a0e

9 years agobuild_image.py: Verity support for flashing non partition spanning fs
Mohamad Ayyash [Tue, 24 Mar 2015 19:42:03 +0000 (12:42 -0700)]
build_image.py: Verity support for flashing non partition spanning fs

Change-Id: Ic5f7b256ed9a31e99ebaebdf8a8a19ba9adcced3
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
9 years agoRevert "Revert "Fix the libgcc/libatomic link order.""
Dan Albert [Tue, 31 Mar 2015 22:21:30 +0000 (15:21 -0700)]
Revert "Revert "Fix the libgcc/libatomic link order.""

This reverts commit e440c3c07b26258139156075f0a51a9ad92eef75.

9 years agoShow annotation documentation on class details
Jeff Arneson [Fri, 27 Mar 2015 22:32:06 +0000 (15:32 -0700)]
Show annotation documentation on class details

Also fix a bug where showAnnotations tags weren't appearing on
symbols without a javadoc

Bug: 19427762
Bug: 19931569
Change-Id: I4de8d5682acc438da69637262d8447695d6fb975

9 years agoam 2f78e36d: am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"
Neil Fuller [Tue, 31 Mar 2015 09:31:59 +0000 (09:31 +0000)]
am 2f78e36d: am 3cc6a0f2: Merge "Addition of a CTS suite for tzdata update code"

* commit '2f78e36ddee92938a9dddd0484781037b5b496eb':
  Addition of a CTS suite for tzdata update code