tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23953 commits 1 branch 0 tags 119 MiB
Commit graph

23953 commits

This branch
This branch
All branches
Author SHA1 Message Date
Evgenii Stepanov
28c1081788 am b8376873: am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode." 
* commit 'b837687362903dab10afbf76f5d387586a6e264f':
  Disable relocation packer in SANITIZE_TARGET mode.
 2015-07-21 18:28:54 +00:00
Tao Bao
5442819cb1 am a04e6b89: am dd68e68f: Merge "Override properties that point to out/ directory." 
* commit 'a04e6b89ec262f4dd38c9d80ee05ce313bab9347':
  Override properties that point to out/ directory.
 2015-07-21 18:28:15 +00:00
Colin Cross
a2cfb78f79 resolve conflicts for merge of 89675456 into mnc-dr-dev-plus-aosp 
Change-Id: Ia99e16eb83902f008960007468dd4d9fba88319a
 2015-07-21 10:56:26 -07:00
Evgenii Stepanov
b837687362 am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode." 
* commit 'db38e7b5d407a438d05fc300b432cc83692643d8':
  Disable relocation packer in SANITIZE_TARGET mode.
 2015-07-21 17:44:47 +00:00
Evgenii Stepanov
db38e7b5d4 Merge "Disable relocation packer in SANITIZE_TARGET mode." 2015-07-21 17:30:03 +00:00
Tao Bao
a04e6b89ec am dd68e68f: Merge "Override properties that point to out/ directory." 
* commit 'dd68e68fdd413fe93b78c648e2564c3c3c5e5cc3':
  Override properties that point to out/ directory.
 2015-07-21 05:13:04 +00:00
Tao Bao
dd68e68fdd Merge "Override properties that point to out/ directory." 2015-07-21 05:01:49 +00:00
repo sync
896754566f resolved conflicts for merge of b097c416 to stage-aosp-master 
Change-Id: I3e0732ee61e5de40c53ade70ee1d9f6a4c3e77d6
 2015-07-21 12:31:17 +09:00
Ying Wang
e176b2be30 am 55fc58cb: am b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build." 
* commit '55fc58cb8f0a53151de48635c5f452bc10691e52':
  Auto-clean host tools when switching between apps_only and platform build.
 2015-07-21 02:35:28 +00:00
Dan Albert
cdb0684d97 am 68b828e2: am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 
* commit '68b828e21699d15eed9166cb37b1cc31bbcee884':
  Revert "Revert "Hide unwinder symbols in each binary.""
 2015-07-21 02:35:10 +00:00
Shinichiro Hamaji
b097c41630 Merge "Do not update previous_XXX.mk when there is no change" 2015-07-21 01:32:41 +00:00
Ying Wang
55fc58cb8f am b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build." 
* commit 'b74823e2ff5de41f3bee87f2de76abe6ff4e617f':
  Auto-clean host tools when switching between apps_only and platform build.
 2015-07-21 00:45:57 +00:00
Shinichiro Hamaji
14da1424e0 Do not update previous_XXX.mk when there is no change 
I'm adding a rule which regenerates ninja files to kati:

8666cfba20

With this regeneration rule, unnecessary re-generation will happen
when these .mk files are updated even if there are no changes in
their contents. With this patch, these .mk files are updated only
when the contents will be actually changed.

Change-Id: I4c796f9454502f6bb25019b3806ca577ea5258c1
 2015-07-21 09:40:02 +09:00
Ying Wang
b74823e2ff Merge "Auto-clean host tools when switching between apps_only and platform build." 2015-07-21 00:32:35 +00:00
Ying Wang
d37b540a39 Auto-clean host tools when switching between apps_only and platform build. 
For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
(cherry-pick from commit 036b53b6de)
 2015-07-20 17:31:08 -07:00
Evgenii Stepanov
4b396e47eb Disable relocation packer in SANITIZE_TARGET mode. 
Workaround for
https://code.google.com/p/address-sanitizer/issues/detail?id=387.

Change-Id: I151c3f0eb7e2a4c92a64192a0b43ac17646eab5c
 2015-07-20 16:32:53 -07:00
Dan Albert
68b828e216 am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 
* commit 'f4ffafb1a3a2d103105650fcd9720aa390360a12':
  Revert "Revert "Hide unwinder symbols in each binary.""
 2015-07-20 23:23:58 +00:00
Dan Albert
f4ffafb1a3 Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 2015-07-20 23:11:59 +00:00
Tao Bao
84e7568b1f Override properties that point to out/ directory. 
A few properties are stored as links to the files in the out/
directory, which are no longer available when (re)packing from
target_files zip. Redirect those properties to the actual files in
the unzipped directory when repacking.

Change-Id: I18e930cbea224ab9c6db8d4e721b1c266a671db6
 2015-07-19 08:48:09 -07: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
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
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
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
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
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
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
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
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