Commit Graph

9244 Commits

Author SHA1 Message Date
Christopher Wiley
d1eea90a72 Merge "Keep aidl generated C++ inside the generated folder" am: 11feb8b075
am: 7c52b2d878

* commit '7c52b2d878e6234cb6e36942c87c438fa1e80240':
  Keep aidl generated C++ inside the generated folder
2016-01-21 18:29:15 +00:00
Christopher Wiley
7c52b2d878 Merge "Keep aidl generated C++ inside the generated folder"
am: 11feb8b075

* commit '11feb8b075ce48fc4b6386049a666a5e888247f8':
  Keep aidl generated C++ inside the generated folder
2016-01-21 18:26:54 +00:00
Christopher Wiley
11feb8b075 Merge "Keep aidl generated C++ inside the generated folder" 2016-01-21 18:17:29 +00:00
Narayan Kamath
9a39d29241 Merge "Make a confusing error message clearer." 2016-01-21 10:15:40 +00:00
Narayan Kamath
1b5f487f10 Make a confusing error message clearer.
The java version doesn't matter here.

Change-Id: Ieb933f87d1255e7aea5d21b3ac96e4f1f755deea
2016-01-20 18:48:59 +00:00
Christopher Wiley
257796c62d Keep aidl generated C++ inside the generated folder
Transform ../ to dotdot/ for C++ generateds from .aidl source files.
This forces us to use one layer of indirection to calculate the build
rules for .aidl files, since we can no longer use a pattern rule.

This was tested by modifying system/tools/aidl's Android.mk to refer to
its .aidl files by going up two directories and then repeating the
directories again.  When I print the build rules with $(info) I see that
dotdot/ appears in appropriate places (C++ paths, but not .aidl paths).

Bug: 26407018
Test: Described above.

Change-Id: I397c9d10408c0c66d8b5a247a1f34eb4bf4f74ce
2016-01-20 09:17:20 -08:00
Yigit Boyar
5b97d086e9 Fix data binding source paths
Bug: 26581427

Change-Id: If8acc01fa610663248fa894ac04b3268bc77f739
2016-01-20 12:20:10 +00:00
Chih-hung Hsieh
70c41f2f26 Merge "Set USE_CLANG_PLATFORM_BUILD to default true." am: c36a9760e1
am: 2ba3e15de1

* commit '2ba3e15de184d869d82e21111dfe3471f1c4846b':
  Set USE_CLANG_PLATFORM_BUILD to default true.
2016-01-20 00:02:49 +00:00
Chih-hung Hsieh
2ba3e15de1 Merge "Set USE_CLANG_PLATFORM_BUILD to default true."
am: c36a9760e1

* commit 'c36a9760e17bc0ce1cc815572886e640bb0ded18':
  Set USE_CLANG_PLATFORM_BUILD to default true.
2016-01-19 23:57:53 +00:00
Chih-hung Hsieh
c36a9760e1 Merge "Set USE_CLANG_PLATFORM_BUILD to default true." 2016-01-19 23:40:56 +00:00
Tao Bao
49fe96c376 Merge "Makefile: Pack brillo_update_payload and shflags into otatools." am: 4dc400e753
am: d08cc69b6e

* commit 'd08cc69b6ec59654a0ff59e5a4e286faa31629c7':
  Makefile: Pack brillo_update_payload and shflags into otatools.
2016-01-19 23:06:40 +00:00
Tao Bao
d08cc69b6e Merge "Makefile: Pack brillo_update_payload and shflags into otatools."
am: 4dc400e753

* commit '4dc400e75336d0e09f509c9fd100c49cfb42ed5c':
  Makefile: Pack brillo_update_payload and shflags into otatools.
2016-01-19 23:04:12 +00:00
Tao Bao
6d8a8cc634 Makefile: Pack brillo_update_payload and shflags into otatools.
brillo_update_payload and shflags are the scripts to generate A/B OTA
package (payload). Include them into otatools.zip.

brillo_update_payload was already included in previous CL. Move it to
the folder for executables.

Bug: 25715402
Change-Id: Idf9c05767c24c55d058cc30e696f06d4eb5fd53b
2016-01-19 14:51:51 -08:00
Chih-Hung Hsieh
8dd69d97f6 Set USE_CLANG_PLATFORM_BUILD to default true.
BUG: 26102335
Change-Id: I3b9fa2dfbee361410caf163147945ab448bb8ddf
2016-01-19 11:43:44 -08:00
Michael Wright
9dca07efdc Only fail on known-bad grep configurations.
Rather than exit when any grep configuration is set, only fail on ones we know
to be bad. This lets people use benign configuration options such as
--color=auto and --directories=skip.

Bug: 21260618
Change-Id: I3641c7895df4b43e36a983ea6ad877969cd38bf5
2016-01-18 18:13:03 -08:00
Dan Willemsen
543623c2b6 Merge "Add -Werror=date-time to target builds" am: 5c3f812507
am: 9f41040b00

* commit '9f41040b000bf2ea98b70eea6f60a41385d55fe3':
  Add -Werror=date-time to target builds
2016-01-16 20:18:54 +00:00
Dan Willemsen
9f41040b00 Merge "Add -Werror=date-time to target builds"
am: 5c3f812507

* commit '5c3f812507bd025da2fc3d5fa40e8a278535dff2':
  Add -Werror=date-time to target builds
2016-01-16 20:17:01 +00:00
Dan Willemsen
5c3f812507 Merge "Add -Werror=date-time to target builds" 2016-01-16 20:13:30 +00:00
Neil Fuller
586f3cb4e0 Merge "Revert "Revert "Revert "Revert "Make OpenJDK 8 the default""""" 2016-01-15 23:36:19 +00:00
Neil Fuller
3dfaceea79 Revert "Revert "Revert "Revert "Make OpenJDK 8 the default""""
This reverts commit ee89f219ea.

This reapplies commit
1bd16b67c4
for the third time.

Change-Id: I3be72f643f5ddce87dfc39d98f19e395525554d8
2016-01-15 16:35:54 +00:00
Neil Fuller
571055a442 Merge "Revert "Revert "Revert "Make OpenJDK 8 the default"""" 2016-01-14 21:15:17 +00:00
Neil Fuller
ee89f219ea Revert "Revert "Revert "Make OpenJDK 8 the default"""
This reverts commit c288d65762.

The launch control change that switched various builds
to JDK 8 was reverted so JDK 8 can't be mandatory without
breaking builds.

Change-Id: I5e3feb21488d3bb57c5718cfe105a931eeaa9587
2016-01-14 21:12:27 +00:00
Neil Fuller
cd7a94da67 Merge "Revert "Revert "Make OpenJDK 8 the default""" 2016-01-14 13:23:52 +00:00
Dan Willemsen
cd1bcb8b40 Merge "Allow building kati & makeparallel with soong" am: 77cde9e244
am: 766eeb747e

* commit '766eeb747ef5714f6027f371394ca08c6bc1057e':
  Allow building kati & makeparallel with soong
2016-01-14 02:08:54 +00:00
Dan Willemsen
766eeb747e Merge "Allow building kati & makeparallel with soong"
am: 77cde9e244

* commit '77cde9e244de9b043793ef528818de0ffea862e1':
  Allow building kati & makeparallel with soong
2016-01-14 02:05:24 +00:00
Stephen Hines
cb7aa7951d Merge "Switch to Vista instead of Win2K." am: c8299320da
am: 4f14e16324

* commit '4f14e1632484b6a661967e3feaa9325b4bdc7a6e':
  Switch to Vista instead of Win2K.
2016-01-13 23:42:52 +00:00
Dan Willemsen
3f60c4b6c0 Allow building kati & makeparallel with soong
This uses far fewer hacks in order to build these host tools, but will
require more libraries(libc++,etc) from unbundled and stripped down
branches.

Once this becomes the only option, all builds will happen after soong
runs. Then the toolchain / global cflags information will be able to be
moved from make to soong (and exported back to make).

Change-Id: I270b1d92bcef28a96fbc3ec9910d9bd0c101ac0f
2016-01-13 13:08:29 -08:00
Stephen Hines
4f14e16324 Merge "Switch to Vista instead of Win2K."
am: c8299320da

* commit 'c8299320dac3a399430be37e0581bc263bef997e':
  Switch to Vista instead of Win2K.
2016-01-13 20:52:09 +00:00
Stephen Hines
c8299320da Merge "Switch to Vista instead of Win2K." 2016-01-13 20:47:13 +00:00
Colin Cross
1ed08efbb9 Merge "Ignore Android.mk files with USE_SOONG=true"
am: 19f6638026

* commit '19f6638026b8481e04003fcbd5a8ef017a66d9c8':
  Ignore Android.mk files with USE_SOONG=true
2016-01-13 20:43:22 +00:00
Colin Cross
19f6638026 Merge "Ignore Android.mk files with USE_SOONG=true" 2016-01-13 20:32:26 +00:00
Dan Willemsen
942ba5db8c Merge "Remove -Wa,noexecstack from unsupported arm clang flags" am: d29a84161e
am: b2cfef28fb

* commit 'b2cfef28fbeb3ad010d042e41c273f71e9e3ebd2':
  Remove -Wa,noexecstack from unsupported arm clang flags
2016-01-13 18:50:18 +00:00
Tao Bao
1269cfbd02 Merge "Fix mounting /sdcard under recovery." am: 948b9c30b4
am: 506cbfa8b4

* commit '506cbfa8b4f8e70900527311528a60053dae1c61':
  Fix mounting /sdcard under recovery.
2016-01-13 18:50:12 +00:00
Ying Wang
0afedd89f7 Merge "Move "include configure_local_jack.mk"" am: 5799af6563
am: 50b3d28dcc

* commit '50b3d28dcc66c6af4821d9655c782365a11fe284':
  Move "include configure_local_jack.mk"
2016-01-13 18:45:01 +00:00
Ying Wang
f0ebe165b9 Generate .c for .y and .l
- For .l/.y source files, generate .c files; for .ll/.yy source files,
  generate c++ files.
- Simplified the rules by adding the generated sources to
  my_generated_sources.
- Simplified generated header file naming by always using .h extension
  with bison's "--defines=" option.
- Removed the unnecesarry conditional inclusion to the generated
  headers. Bison already automatically generates such things.

Bug: 26492989
Change-Id: I9ab6dc149c258f7642bc36c3fa32f90ff7ee51a4
2016-01-12 21:07:27 -08:00
Zach Jang
c6c48b01d9 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 am: 1b29f2f9c9 am: b0b568b5c8
am: a9ac12d276

* commit 'a9ac12d276448e30cadf34099dea7001d67a2c43':
  Updating security patch string to 2016-03-01
2016-01-13 02:11:25 +00:00
Stephen Hines
625e7159ff Switch to Vista instead of Win2K.
Bug: http://b/26524325
Bug: http://b/25282907

The latest Clang/LLVM requires Vista APIs in order to execute, so we
need to bump the minimum required Windows version for our host tools.

Change-Id: Ic1a760bc240060f5de39ce3a68484886021ff3d9
2016-01-12 17:56:47 -08:00
Dan Willemsen
b2cfef28fb Merge "Remove -Wa,noexecstack from unsupported arm clang flags"
am: d29a84161e

* commit 'd29a84161edf1c82b988c8b181638b9b37540e6d':
  Remove -Wa,noexecstack from unsupported arm clang flags
2016-01-13 01:02:40 +00:00
Dan Willemsen
d29a84161e Merge "Remove -Wa,noexecstack from unsupported arm clang flags" 2016-01-13 00:56:59 +00:00
Dan Willemsen
d1baa0f001 Remove -Wa,noexecstack from unsupported arm clang flags
This was marked as unsupported only on arm[64], even though it works.
For soong, we want to keep a single list of unsupported clang flags
for all architectures.

Change-Id: I9c4ae0f255c549d2346ba7abae57e22c86ddcc61
2016-01-12 15:54:57 -08:00
Tao Bao
506cbfa8b4 Merge "Fix mounting /sdcard under recovery."
am: 948b9c30b4

* commit '948b9c30b4197a709846e604c8e571d90161b17f':
  Fix mounting /sdcard under recovery.
2016-01-12 22:32:11 +00:00
Tao Bao
3f56a33041 Fix mounting /sdcard under recovery.
The CL in [1] changed to create a symlink to /storage/self/primary for
/sdcard. It breaks the mount of /sdcard under recovery.

[1] commit 595003a3d06a13862052ef2f4f578371dae5ad65

Bug: 26509280
Change-Id: I98d02d54d707c2c8826c5ee119cf1a3ffa0c4bc9
2016-01-12 11:40:30 -08:00
Ying Wang
0f0b6962ed Merge "Generate .c for .y and .l"
am: 873eeec194

* commit '873eeec1944c46cd50779cd4fc8d4cd8ca0457ea':
  Generate .c for .y and .l
2016-01-12 18:57:03 +00:00
Ying Wang
50b3d28dcc Merge "Move "include configure_local_jack.mk""
am: 5799af6563

* commit '5799af6563c2da0a3730f1d4e007052c429ccaf8':
  Move "include configure_local_jack.mk"
2016-01-12 18:56:53 +00:00
Ying Wang
873eeec194 Merge "Generate .c for .y and .l" 2016-01-12 17:35:30 +00:00
Neil Fuller
c288d65762 Revert "Revert "Make OpenJDK 8 the default""
This reverts commit a87553f414.

Change-Id: Ibd7bf08f3adfdc3f50584b8a61b3f81f1bff53de
2016-01-12 15:11:32 +00:00
Ying Wang
64088f2459 Generate .c for .y and .l
- For .l/.y source files, generate .c files; for .ll/.yy source files,
  generate c++ files.
- Simplified the rules by adding the generated sources to
  my_generated_sources.
- Simplified generated header file naming by always using .h extension
  with bison's "--defines=" option.
- Removed the unnecesarry conditional inclusion to the generated
  headers. Bison already automatically generates such things.

Bug: 26492989
Change-Id: I9ab6dc149c258f7642bc36c3fa32f90ff7ee51a4
2016-01-11 17:41:56 -08:00
Zach Jang
a9ac12d276 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 am: 1b29f2f9c9
am: b0b568b5c8

* commit 'b0b568b5c8731e40c53a6bfc3149a3720d1a2570':
  Updating security patch string to 2016-03-01
2016-01-12 01:40:37 +00:00
Zach Jang
b0b568b5c8 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5
am: 1b29f2f9c9

* commit '1b29f2f9c97bc1b099712cd7c93c31e7f7a18ad1':
  Updating security patch string to 2016-03-01
2016-01-12 01:38:31 +00:00
Zach Jang
6facd249d5 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57
am: 6c61548bb7

* commit '6c61548bb7e426704760c9351e3211fb45d67dae':
  Updating security patch string to 2016-03-01
2016-01-12 01:33:23 +00:00