p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25,961 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

25961 Commits

Author SHA1 Message Date
Shinichiro Hamaji c3725c256b Merge "Revert "Build ijar for apps build"" 
am: d17c3a57f6

* commit 'd17c3a57f6f183b97cc557e10e221b4dc1acf47f':
  Revert "Build ijar for apps build"
 2015-11-27 04:02:01 +00:00
Shinichiro Hamaji 2ff3ad9045 Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"" 2015-11-27 03:59:30 +00:00
Shinichiro Hamaji d17c3a57f6 Merge "Revert "Build ijar for apps build"" 2015-11-27 03:59:18 +00:00
Shinichiro Hamaji 3ae7f66bab Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" 
This reverts commit c1f5d9c203.

Change-Id: I7e9969a060e3f1380154da65e76134168aee15d8
 2015-11-27 03:58:51 +00:00
Shinichiro Hamaji ea2da50e17 Revert "Build ijar for apps build" 
This reverts commit 9084705744.

Change-Id: I8a9958788c51dcec5028ef396cb67abd541ce31f
 2015-11-27 03:57:17 +00:00
Colin Cross 6cd88d7514 Merge "Revert "Use libstdc++ for ijar"" 
am: 41dca40376

* commit '41dca403766d22373ba469d99ba1625d0930d02e':
  Revert "Use libstdc++ for ijar"
 2015-11-26 22:23:02 +00:00
Colin Cross 41dca40376 Merge "Revert "Use libstdc++ for ijar"" 2015-11-26 22:20:38 +00:00
Colin Cross 39cca23d41 Revert "Use libstdc++ for ijar" 
This reverts commit 718bab6aec.

Change-Id: I9aa222fc2936d7d89ae0700eeef505c6b317d777
 2015-11-26 22:20:22 +00:00
Colin Cross 4c1944083f Merge "Use libstdc++ for ijar" 
am: c97b5272d7

* commit 'c97b5272d715ab9f4ff52748bd2f403235f94426':
  Use libstdc++ for ijar
 2015-11-26 22:12:38 +00:00
Colin Cross c97b5272d7 Merge "Use libstdc++ for ijar" 2015-11-26 22:10:31 +00:00
Colin Cross 718bab6aec Use libstdc++ for ijar 
For some reason ijar won't build against libc++ for TARGET_BUILD_APPS
builds, but does build with libstdc++.

Change-Id: I8e900b0f764f0bb8f827705cb9173f07e4f33862
 2015-11-26 14:09:50 -08:00
Colin Cross 3b5dbebe8d Merge "Build ijar for apps build" 
am: ec4db56e58

* commit 'ec4db56e5802171bc2d0237f496e97ec093f0be0':
  Build ijar for apps build
 2015-11-26 17:36:29 +00:00
Colin Cross ec4db56e58 Merge "Build ijar for apps build" 2015-11-26 17:34:50 +00:00
Paul Duffin 9c4bb4c1c0 Merge "Fix generated-sources-dir-for for COMMON" 
am: 623799d3e0

* commit '623799d3e0aab49b00552fb7862f2528b845bd51':
  Fix generated-sources-dir-for for COMMON
 2015-11-26 11:43:02 +00:00
Paul Duffin 623799d3e0 Merge "Fix generated-sources-dir-for for COMMON" 2015-11-26 11:39:30 +00:00
Shinichiro Hamaji 9084705744 Build ijar for apps build 
This fixes git_master-linux-apps build.

Change-Id: I1a77b2495d98d89f570cb165d7f25f617c9af9aa
 2015-11-26 17:24:40 +09:00
Shinichiro Hamaji 27770abe27 Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" 
am: c9a1b27845

* commit 'c9a1b278458eddd3065c0e9fc06e12b2cb1c38cb':
  Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
 2015-11-26 05:30:54 +00:00
Shinichiro Hamaji c9a1b27845 Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" 2015-11-26 05:25:58 +00:00
Paul Duffin 699a32217a Fix generated-sources-dir-for for COMMON 
When the 4th argument specified is non-empty then it attempts to
use either HOST_OUT_GEN_COMMON or TARGET_OUT_GEN_COMMON
depending on whether the 3rd argument is non-empty or not
respectively. Unfortunately, those two variables do not exist,
the correct names for those variables is HOST_OUT_COMMON_GEN and
TARGET_OUT_COMMON_GET.

Change-Id: I66edb02824c06e0f504ebe04ff80ddbd77a16c95
 2015-11-25 13:14:23 +00:00
Tao Bao acd1b8e160 Merge "target_files_diff: Allow writing outputs to file." 
am: 7b5eddd52b

* commit '7b5eddd52bfb70485488458a115a33f1af92759a':
  target_files_diff: Allow writing outputs to file.
 2015-11-25 00:03:01 +00:00
Tao Bao 7b5eddd52b Merge "target_files_diff: Allow writing outputs to file." 2015-11-24 23:57:44 +00:00
Tao Bao 5dd9a2ce11 target_files_diff: Allow writing outputs to file. 
Also clean up some pylint warnings.

Bug: 25372309
Change-Id: I226bfd72cb1310ba77352f8d367803e815e1cfa3
 2015-11-24 15:23:20 -08:00
Ying Wang f0522b0c34 Merge "Fix typo." 
am: deeb2d2453

* commit 'deeb2d245397a8330890247697d01629f763ec31':
  Fix typo.
 2015-11-24 22:16:45 +00:00
Ying Wang deeb2d2453 Merge "Fix typo." 2015-11-24 22:09:49 +00:00
Ying Wang 6cce4026ff Fix typo. 
Change-Id: I299076791c620968fa7a5c420b5ca21ea4d30b51
 2015-11-24 14:09:11 -08:00
Ying Wang fdfd0b0d81 Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." 
am: 81bbac6a0f

* commit '81bbac6a0fe76f2b007f6f0c2c3dc44f85fd4dd6':
  Don't delete META-INF in jack-java-to-dex when packing resources.
 2015-11-24 22:01:54 +00:00
Ying Wang 81bbac6a0f Merge "Don't delete META-INF in jack-java-to-dex when packing resources." 2015-11-24 21:58:06 +00:00
Ying Wang 3be52e6692 Don't delete META-INF in jack-java-to-dex when packing resources. 
LOCAL_DONT_DELETE_JAR_META_INF is meant for deleting resources carried
by static Java libraries, see comment in clear_vars.mk.
For a module's own resources, we should pick up whatever in
LOCAL_JAVA_RESOURCE_DIRS.
The same applies  when building .jack from a  prebult jar in
transform-jar-to-jack.

Bug: 25860887
Change-Id: I20c120e039342a1124362c5f8747eace94b03931
(cherry-pick from commit 996ae38ffd)
 2015-11-24 13:57:10 -08:00
Chih-hung Hsieh 54ac6cd527 Merge "Move mips64 target to clang by default." 
am: b0d9108795

* commit 'b0d9108795caea4b88be42d208c7a21e73de4c9f':
  Move mips64 target to clang by default.
 2015-11-24 21:17:55 +00:00
Chih-hung Hsieh 917f4aea1d Merge "Move mips target to clang by default." 
am: 80d6b0a9c6

* commit '80d6b0a9c607b15a70512996b5a56b0499e426b4':
  Move mips target to clang by default.
 2015-11-24 21:17:47 +00:00
Chih-hung Hsieh b0d9108795 Merge "Move mips64 target to clang by default." 2015-11-24 21:13:38 +00:00
Chih-hung Hsieh 80d6b0a9c6 Merge "Move mips target to clang by default." 2015-11-24 21:13:17 +00:00
Alex Klyubin febce01c64 Merge "Clean up compiler warnings in signapk." 
am: 0aaf7aa53c

* commit '0aaf7aa53ce5d1a8b5880303a21b83959bf1a432':
  Clean up compiler warnings in signapk.
 2015-11-24 17:36:06 +00:00
Alex Klyubin 0aaf7aa53c Merge "Clean up compiler warnings in signapk." 2015-11-24 17:30:42 +00:00
Alex Klyubin c218d3eca3 Clean up compiler warnings in signapk. 
Bug: 25794543
Change-Id: Ia7da4fbaed77af4020e5aa0b14fe5e1bd8521edb
 2015-11-24 09:27:55 -08:00
Shinichiro Hamaji 22a2efde22 Merge "Prevent findleaves.py from traversing copies of " 
am: 84639d127b

* commit '84639d127b50734ef670232bfa43a6fb9f3f0576':
  Prevent findleaves.py from traversing copies of $(OUT_DIR)
 2015-11-24 04:57:26 +00:00
Shinichiro Hamaji 84639d127b Merge "Prevent findleaves.py from traversing copies of $(OUT_DIR)" 2015-11-24 04:54:02 +00:00
Chih-Hung Hsieh 4dcd769f2c Move mips64 target to clang by default. 
Bug: 23163853
Change-Id: Ia3d449f908b09ce95b3de246c8c699d171dcbaa3
 2015-11-20 13:35:44 -08:00
Chih-Hung Hsieh 990407e0a5 Move mips target to clang by default. 
Bug: 23163853
Change-Id: I408ffd90ff2ff075e03962fffd1681fccf0319d3
 2015-11-20 13:32:22 -08:00
Neil Fuller 2fc3bef75a Merge "Use sensible default locations for Java" 
am: 8f354bc8c2

* commit '8f354bc8c2d4c27d93c7e13a853e0c9088d6ba94':
  Use sensible default locations for Java
 2015-11-20 10:20:13 +00:00
Neil Fuller 8f354bc8c2 Merge "Use sensible default locations for Java" 2015-11-20 10:16:17 +00:00
Tao Bao 733ba8f0e4 Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." 
am: 4ed5735a68

* commit '4ed5735a68090e9eec240693ff6b97ea57576151':
  releasetools: Fix the bug with TARGET_NO_RECOVERY.
 2015-11-20 04:50:31 +00:00
Tao Bao 4ed5735a68 Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." 2015-11-20 04:47:42 +00:00
Ying Wang 59ab005dde Merge "Increase droiddoc -J-Xmx to 1600MB." 
am: 01f49a3d5e

* commit '01f49a3d5e5d8f4fdd83d1b74a230f8160aabe08':
  Increase droiddoc -J-Xmx to 1600MB.
 2015-11-20 02:38:00 +00:00
Ying Wang 01f49a3d5e Merge "Increase droiddoc -J-Xmx to 1600MB." 2015-11-20 02:33:11 +00:00
Ying Wang 02bcb27b4a Increase droiddoc -J-Xmx to 1600MB. 
As we occasionally see  java.lang.OutOfMemoryError when running
doc-comment-check-docs.

Bug: 25787786
Change-Id: I6c505c96ec36d09d28d400e03027b169870c49bb
 2015-11-19 18:31:01 -08:00
Tao Bao 48550cceb0 releasetools: Fix the bug with TARGET_NO_RECOVERY. 
The packaging script is broken when we set TARGET_NO_RECOVERY and
SYSTEM_ROOT_IMAGE both. With TARGET_NO_RECOVERY set, we don't have
RECOVERY/RAMDISK/etc/recovery.fstab. It thus fails the assertion in
common.LoadRecoveryFSTab() that "/" must exist in fstab when enabling
SYSTEM_ROOT_IMAGE.

Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
 2015-11-19 17:14:21 -08:00
Christopher Wiley dbc3d09ca6 Merge "Fix race in C++ AIDL file generation" 
am: b2055df782

* commit 'b2055df782eb5276128ef14ac4724d32f94e1aec':
  Fix race in C++ AIDL file generation
 2015-11-19 22:07:06 +00:00
Colin Cross d924c14097 Merge "Switch to using kati env script" 
am: 7926e42209

* commit '7926e42209b41766369e49b2093e6334564f93d4':
  Switch to using kati env script
 2015-11-19 22:06:52 +00:00
Christopher Wiley b2055df782 Merge "Fix race in C++ AIDL file generation" 2015-11-19 22:01:27 +00:00