Commit graph

24234 commits

Author SHA1 Message Date
Yohann Roussel
b3b6348921 Revert "Clean call-jack and its callers"
This reverts commit 4c1fc77c2e.

Change-Id: I4f5e3ec1e6fea66f315a9411db17de257817dcc9
2015-07-21 16:45:51 +00:00
Yohann Roussel
4c1fc77c2e Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.

(cherry picked from commit 5e50b34221)

Change-Id: I5dce864624e97c27441a5ee7f8c3cd582613390e
2015-07-21 00:22:45 +02:00
Colin Cross
2b8f32c2ab am f37a042e: am 0f0a6b62: am 03e74d66: Merge "Move @echo to first command in rules"
* commit 'f37a042e274b36fc54934a3faf6ecf04c3dd6bfb':
  Move @echo to first command in rules
2015-07-17 23:30:58 +00:00
Colin Cross
f37a042e27 am 0f0a6b62: am 03e74d66: Merge "Move @echo to first command in rules"
* commit '0f0a6b62bf9e06f980d86fbd6afeaad33fef03e5':
  Move @echo to first command in rules
2015-07-17 23:22:48 +00:00
Colin Cross
0f0a6b62bf am 03e74d66: Merge "Move @echo to first command in rules"
* commit '03e74d66c73558b517a56be75acc9a391c676ba8':
  Move @echo to first command in rules
2015-07-17 23:12:41 +00:00
Colin Cross
03e74d66c7 Merge "Move @echo to first command in rules" 2015-07-17 23:01:59 +00:00
Colin Cross
b6da589f60 Move @echo to first command in rules
Move the @echo command that prints the rule description to be the
first command in each rule so that the kati tool can find it to
use as a ninja rule description.

Change-Id: I90f27c35bb719d327a7f2109f8d00d3589082f19
2015-07-16 17:14:27 -07:00
Ying Wang
459436c4b4 am 31971a38: am e3927d79: am e9b4605a: am 7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '31971a3847f94240bcf3c977d11407f5c4a943dd':
  Add LOCAL_NO_LIBGCC.
2015-07-16 23:20:30 +00:00
Ying Wang
31971a3847 am e3927d79: am e9b4605a: am 7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit 'e3927d79fa70467798785b546f8899d07e578ec8':
  Add LOCAL_NO_LIBGCC.
2015-07-16 23:05:28 +00:00
Ying Wang
e3927d79fa am e9b4605a: am 7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit 'e9b4605a9a42ce30857a1389463a81a99b0dd688':
  Add LOCAL_NO_LIBGCC.
2015-07-16 22:33:50 +00:00
Ying Wang
e9b4605a9a am 7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '7ac6cb804083a67d31a16b910dabfb76b30150a3':
  Add LOCAL_NO_LIBGCC.
2015-07-16 22:18:19 +00:00
Ying Wang
3f6833bfd1 Merge "Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR" 2015-07-16 21:36:11 +00:00
Ying Wang
5adfc3eb8b Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR
When calling droiddoc to generate stubs, if you use
LOCAL_DROIDDOC_STUB_OUT_DIR (instead of "-stubs" to
LOCAL_DROIDDOC_LOCAL_DROIDDOC_OPTIONS), the build system gets the chance
to clean up the stub out directory before calling doclava.

Bug: 22534021
Change-Id: Icb0a73eb51bfb1c1ecd88217ebcd39c27df1de29
2015-07-16 14:23:53 -07:00
Ying Wang
7ac6cb8040 Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.

Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
(cherry picked from commit 75011b2003)
2015-07-16 13:36:47 -07:00
Ying Wang
7dd186c812 am a5c47569: am f943e811: am e421b10f: am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit 'a5c47569718370fbc00689098df91286a9dac805':
  Don't uncompress/page-align the jni libraries in apps_only build.
2015-07-16 19:49:25 +00:00
Ying Wang
a5c4756971 am f943e811: am e421b10f: am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit 'f943e811febec5a50493a1c7449f8cd2cbda9432':
  Don't uncompress/page-align the jni libraries in apps_only build.
2015-07-16 19:35:50 +00:00
Nick Kralevich
33ca9db5c5 am 17ca1f5d: am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
* commit '17ca1f5d26aebd25fa89e86082d2fe423174aeae':
  file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:35:23 +00:00
Nick Kralevich
17ca1f5d26 am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
* commit '4a5f5a7b15e27ed159e2398c77de1de7f9fd4da9':
  file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:19:56 +00:00
Ying Wang
f943e811fe am e421b10f: am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit 'e421b10f1c50aa11bd4ca299537c16bac0263da8':
  Don't uncompress/page-align the jni libraries in apps_only build.
2015-07-16 19:10:08 +00:00
Nick Kralevich
4a5f5a7b15 am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"
* commit 'a972891f442d255925df0beadfcfddb81af61575':
  file_contexts: Label /dev/ttyS2 as console_device
2015-07-16 19:03:13 +00:00
Ying Wang
e421b10f1c am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit 'e8ecab8d099f465d527f7bc0fbd04f26ac477a93':
  Don't uncompress/page-align the jni libraries in apps_only build.
2015-07-16 19:01:55 +00:00
Ying Wang
e8ecab8d09 Merge "Don't uncompress/page-align the jni libraries in apps_only build." into mnc-dev 2015-07-16 18:51:19 +00:00
Nick Kralevich
a972891f44 Merge "file_contexts: Label /dev/ttyS2 as console_device" 2015-07-16 18:47:56 +00:00
Miodrag Dinic
df2620ada4 file_contexts: Label /dev/ttyS2 as console_device
This fixes the issue with the emulator "-shell" option.
Init tries to open the console which is passed through
the kernel androidboot.console property, but fails to
open it because "avc" denies it. Init only has permissions
to open console_device in rw mode. This ensures that
/dev/ttyS2 is properly labeled as console_device.

Replaced tabs with spaces.

Change-Id: I9ef94576799bb724fc22f6be54f12de10ed56768
2015-07-16 20:36:07 +02:00
George Mount
3d8a40467e am 464827d1: am daf97ac2: am 54152d30: am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '464827d1e8f5b51df3e6b579f9d83e11c836effb':
  Add data binding to built javadoc.
2015-07-16 17:17:40 +00:00
George Mount
464827d1e8 am daf97ac2: am 54152d30: am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit 'daf97ac2b63ed68b34f0dfd52d9f88ff1c7bd79d':
  Add data binding to built javadoc.
2015-07-16 15:09:40 +00:00
George Mount
daf97ac2b6 am 54152d30: am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '54152d3062b436a0bb060544f1311d124c81bdbe':
  Add data binding to built javadoc.
2015-07-16 14:42:21 +00:00
George Mount
54152d3062 am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '087243ddcb61b602f4d4eb03022844021a659fda':
  Add data binding to built javadoc.
2015-07-16 14:29:34 +00:00
George Mount
087243ddcb Merge "Add data binding to built javadoc." into mnc-dev 2015-07-16 14:18:43 +00:00
Ying Wang
1f8964d388 Don't uncompress/page-align the jni libraries in apps_only build.
Don't uncompress/page-align the jni libraries in apps_only build,
because the apk may be run on older platforms that don't support loading
jni directly from apk.
When prebuilt apks are installed to platform build, the build system
will automatically uncompress/page-align the prebuit apks in M and
downstream, so no need to uncompress/page-align in the apps_only build
either.

Bug: 22491084
Change-Id: I67e977b2592800ae467450592069843b4e5fc466
2015-07-15 18:34:20 -07:00
Tao Bao
0bf4e3fad3 am 6b021161: am 5a2ed731: am f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '6b0211616afe4eba923e98cd78c138acd0d53d84':
  Enable verbose output for add_img_to_target_files.
2015-07-16 00:31:57 +00:00
Tao Bao
6b0211616a am 5a2ed731: am f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit '5a2ed7314f0d6a5dd899694ecfc880cc6a414ff7':
  Enable verbose output for add_img_to_target_files.
2015-07-16 00:13:17 +00:00
Tao Bao
5a2ed7314f am f737a120: Merge "Enable verbose output for add_img_to_target_files."
* commit 'f737a1209841aee5ac76e39677d8ddba0115cae2':
  Enable verbose output for add_img_to_target_files.
2015-07-16 00:02:32 +00:00
Tao Bao
f737a12098 Merge "Enable verbose output for add_img_to_target_files." 2015-07-15 23:54:28 +00:00
Nick Kralevich
140dfdbe64 am db44b568: am abbf8eeb: am a521a37d: Merge "mgrep: add output to environment commands"
* commit 'db44b56859c8c0a8c417cffda9891881849c73d0':
  mgrep: add output to environment commands
2015-07-15 20:26:41 +00:00
Nick Kralevich
db44b56859 am abbf8eeb: am a521a37d: Merge "mgrep: add output to environment commands"
* commit 'abbf8eeb674b1a9d9b8ac1cc8744f03144c3968c':
  mgrep: add output to environment commands
2015-07-15 20:17:51 +00:00
Evgenii Stepanov
eaf2efa37c am 545a6bb2: am 275e3c8c: am 2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '545a6bb2a636fe0981364749e5f00be41789a434':
  Use a different linker for ASan binaries.
2015-07-15 20:12:00 +00:00
Nick Kralevich
abbf8eeb67 am a521a37d: Merge "mgrep: add output to environment commands"
* commit 'a521a37da9214ecc6400b7caf00b76869b1dc741':
  mgrep: add output to environment commands
2015-07-15 20:06:00 +00:00
Evgenii Stepanov
545a6bb2a6 am 275e3c8c: am 2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '275e3c8c105e5702b25868f80983c82c668e5664':
  Use a different linker for ASan binaries.
2015-07-15 19:59:13 +00:00
Nick Kralevich
a521a37da9 Merge "mgrep: add output to environment commands" 2015-07-15 19:54:04 +00:00
Evgenii Stepanov
275e3c8c10 am 2d0ec893: Merge "Use a different linker for ASan binaries."
* commit '2d0ec89357e29138abc28f65876e4aaa208f961c':
  Use a different linker for ASan binaries.
2015-07-15 19:43:45 +00:00
Evgenii Stepanov
2d0ec89357 Merge "Use a different linker for ASan binaries." 2015-07-15 19:34:06 +00:00
Tao Bao
7055791db5 Enable verbose output for add_img_to_target_files.
Change-Id: I7246c59c79ccf6a7589c884391d0f690746fc129
2015-07-15 11:53:39 -07:00
Tao Bao
4f7a7ead37 am 6cc282c1: am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit '6cc282c10ac60beb1c06b1fdd2f9db1e2b9ba9f5':
  Assert the stash size when generating OTAs.
2015-07-14 21:04:20 +00:00
Evgenii Stepanov
2e00221ef5 am db511b80: am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables."
* commit 'db511b80760a6adb1758f3e34c05f01ab860cd70':
  Disable detection of bugs on global variables.
2015-07-14 21:04:18 +00:00
Tao Bao
6cc282c10a am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit '0d4a9405938210618bb305e33285f555daf2fb5d':
  Assert the stash size when generating OTAs.
2015-07-14 20:53:40 +00:00
Evgenii Stepanov
db511b8076 am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables."
* commit 'e71711901f5395de5af64724a9d254173b298108':
  Disable detection of bugs on global variables.
2015-07-14 20:46:19 +00:00
Tao Bao
0d4a940593 am ecb7b37b: Merge "Assert the stash size when generating OTAs."
* commit 'ecb7b37be27e1d7eda5c5aca67c59b88591b9530':
  Assert the stash size when generating OTAs.
2015-07-14 20:45:55 +00:00
Tao Bao
ecb7b37be2 Merge "Assert the stash size when generating OTAs." 2015-07-14 20:37:50 +00:00
Tao Bao
8dcf738234 Assert the stash size when generating OTAs.
With block-based OTA v2 and v3, it requires stash space on the /cache
partition to back up blocks during an update. We need to ensure that
it doesn't exceed the partition size. Since there might be other files
on /cache as well, we use cache_size * threshold as the maximum allowed
size. The threshold defaults to 0.8, which can be overridden by command
line option '--stash_threshold'.

Change-Id: I5c2e353ea4716328d6cdc6a7f758520de8d88b8e
(cherry picked from commit 23ac404212)
2015-07-14 13:36:50 -07:00