StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,687 Commits 1 Branch 0 Tags
c1ed9796bb14cb6257b3550caac107abc7b1aa79
Commit Graph

21687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
c1ed9796bb Revert "Running jarjar on Java resources." 
This reverts commit 140274707e.

Breaks the build on uiautomator_compat.

Change-Id: I6d14f39e3432bf5e691027bbb8e7260e4bec8e8d
 2015-01-21 11:04:22 +00:00
Ying Wang
140274707e Running jarjar on Java resources. 
Before this change, Java resources are added as a separate step
(add-java-resources-to-package) after dex is run, so jarjar isn't run on
the resource files.
With this change, we add Java resources immediately after we call javac,
so jarjar is run on the resource files (the module's own resource, as
well as resources carried by static Java libraries).
When we generate the final apk/jar, we use the jarjar'ed jar as the
inital pacakge file, with class files and empty folders removed.

When jack is enabled, in jack-java-to-dex we add the Java resources to
a temp jar using the PRIVATE_EXTRA_JAR_ARGS, and extrac the files in a
temp dir. Jack will process the resource files and output the result to
PRIVATE_JACK_INTERMEDIATES_DIR. When we package the final apk/jar, we
need to call add-carried-jack-resources to readd the resources.
(TODO: if jack can output all resources to a jar/zip file, we can use
that file as the initial package file as well.)

Bug: 18837479
Change-Id: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
 2015-01-20 11:46:59 -08:00
Jean-Philippe Lesot
5ef304001e Merge "Add clean targets removing jack and dex files" 2015-01-19 10:03:22 +00:00
Ying Wang
4d97b27c51 am c0ff83ae: am 17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6" 
* commit 'c0ff83aebd4ce2ac80247f9b809c27fbf4fc1524':
  [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
 2015-01-16 20:06:46 +00:00
Dirk Dougherty
b5b67b7544 am 4433ac85: am d1283889: am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab. 
* commit '4433ac859c90192914c31f3f8d39230aac41852c':
  Add new subtab under Distribute tab.
 2015-01-16 20:06:35 +00:00
Ying Wang
c0ff83aebd am 17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6" 
* commit '17967eb72f0eb7f495800d5065b64db4a0174362':
  [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
 2015-01-16 18:32:18 +00:00
Dirk Dougherty
4433ac859c am d1283889: am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab. 
* commit 'd12838890563b2fb4532630373760a995970f687':
  Add new subtab under Distribute tab.
 2015-01-16 18:17:59 +00:00
Ying Wang
17967eb72f Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6" 2015-01-16 18:13:36 +00:00
Duane Sand
1a07487493 [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6 
Change-Id: Ice2d0f65eced4fb7dd209fb15610ba555dd45f2c
 2015-01-16 18:13:17 +00:00
Dirk Dougherty
d128388905 am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab. 
* commit '48141e05994ce939b2becab40d86482bda3d9090':
  Add new subtab under Distribute tab.
 2015-01-16 18:11:03 +00:00
Dirk Dougherty
48141e0599 am 5a97f244: am 529a107f: Add new subtab under Distribute tab. 
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
  Add new subtab under Distribute tab.
 2015-01-16 18:03:42 +00:00
Miao Wang
a5e7288791 am eb66dc39: am 62d49dc5: Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib." 
* commit 'eb66dc39a9ec4d62fc65e3c43586dd03a86566cb':
  Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib.
 2015-01-16 16:50:16 +00:00
Miao Wang
a3edd760d3 am 50ef9040: am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)" 
* commit '50ef904068c37792015040c1c28a117fafe328a6':
  Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
 2015-01-16 16:50:15 +00:00
Miao Wang
eb66dc39a9 am 62d49dc5: Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib." 
* commit '62d49dc5db94a5452b87aa3b31cb623987356f51':
  Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib.
 2015-01-16 16:44:17 +00:00
Miao Wang
50ef904068 am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)" 
* commit '2b942f87f6b74ad9c5381fa96dcb1d46f155779b':
  Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
 2015-01-16 16:44:15 +00:00
Miao Wang
62d49dc5db Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib." 2015-01-16 16:34:16 +00:00
Miao Wang
2b942f87f6 Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)" 2015-01-16 16:33:53 +00:00
Yohann Roussel
83d5d04047 Add clean targets removing jack and dex files 
Those should help switching a tree from compiling with Jack back to
legacy toolchain.

Change-Id: I897a9a9923ed8147723b3ab6ad3f276e6b7094bf
 2015-01-16 09:48:24 +01:00
Alexander Levitskiy
4c5166c25d Merge "Add fpc to vendor list" 2015-01-16 02:01:58 +00:00
Dirk Dougherty
5a97f24411 am 529a107f: Add new subtab under Distribute tab. 
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
  Add new subtab under Distribute tab.
 2015-01-16 00:58:59 +00:00
Ying Wang
877fb8974c am 758a029e: am 59cbe2c6: Merge "Emit unique linker buildid in all binaries." 
* commit '758a029e2a7dbe6169fbccd8680e2856ae57ee8b':
  Emit unique linker buildid in all binaries.
 2015-01-16 00:37:02 +00:00
Ying Wang
758a029e2a am 59cbe2c6: Merge "Emit unique linker buildid in all binaries." 
* commit '59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207':
  Emit unique linker buildid in all binaries.
 2015-01-16 00:28:48 +00:00
Dirk Dougherty
529a107f9d Add new subtab under Distribute tab. 
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
 2015-01-15 16:27:39 -08:00
Ying Wang
59cbe2c65c Merge "Emit unique linker buildid in all binaries." 2015-01-16 00:17:19 +00:00
Jeff Davidson
861f88765b am 0c949bd8: am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6." 
* commit '0c949bd86773c5d39df11cd824c9df372dc00342':
  Update protobuf library from 2.3 to 2.6.
 2015-01-16 00:06:05 +00:00
Dehao Chen
734de7a8b4 Emit unique linker buildid in all binaries. 
We want to store the symbol information for all android binaries in a global database.

* We ingest unstripped binaries into the global database
* When we collect address data from device (e.g. instruction pointer address), we want to lookup its symbol information through the global database. The key of the mapping is a unique build id, which is the same between binaries on device (stripped) and unstripped binaries.

After applying this patch, the system.img size increases by 0.0047% (16.3KB).

Change-Id: Id92faf2951f43a30947e8d2b690c1af6bf7e3f54
 2015-01-15 23:09:35 +00:00
Jeff Davidson
0c949bd867 am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6." 
* commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
  Update protobuf library from 2.3 to 2.6.
 2015-01-15 23:01:59 +00:00
Jeff Davidson
64606bd5b0 Merge "Update protobuf library from 2.3 to 2.6." 2015-01-15 22:49:00 +00:00
Stephen Hines
6c61e37f4a am d57b7c64: am 5f31338c: Merge "Add ld.mc as a required executable to core_minimal.mk." 
* commit 'd57b7c640dbc25fa1265543ca680a222003cf324':
  Add ld.mc as a required executable to core_minimal.mk.
 2015-01-15 19:06:31 +00:00
Stephen Hines
d57b7c640d am 5f31338c: Merge "Add ld.mc as a required executable to core_minimal.mk." 
* commit '5f31338c1bbc0a958d390d7b21ecf5fc66d29ffd':
  Add ld.mc as a required executable to core_minimal.mk.
 2015-01-15 18:08:15 +00:00
Yohann Roussel
8b5ff260d9 Merge "Use Jack to check build" 2015-01-15 17:58:36 +00:00
Yohann Roussel
b515f27d6b Merge "Don't exlude META-INF resources when building with Jack" 2015-01-15 17:56:23 +00:00
Stephen Hines
5f31338c1b Merge "Add ld.mc as a required executable to core_minimal.mk." 2015-01-15 17:54:55 +00:00
Yohann Roussel
5dd3e1d312 Don't exlude META-INF resources when building with Jack 
java-to-jack is not manipulating jar files, just zip files so there
are no META-INF files generated by jar in them and no reason to filter
them out. And mainly, there are valid META-INF resources in the tree
we must keep.

Bug: 8287658
Bug: 18901198
Change-Id: Ice0fafca686b8fa3bafd886076946fbb1f952fb6
 2015-01-15 18:53:42 +01:00
Yohann Roussel
8bc90fd2d6 Use Jack to check build 
Of modules that are to be compiled with Jack.

Change-Id: Ie8bd00f67f09c0e5ed8fe650f5131a3dfc29e277
 2015-01-15 11:23:38 +01:00
Yohann Roussel
2826cb961b Merge "Remove some useless depencies" 2015-01-15 09:09:47 +00:00
Andres Morales
1ea1d64771 am 121e53ca: am e1f21520: Merge "Add build.prop to root ramdisk" 
* commit '121e53cace8f2cea7b847c5efacfba06325e59f0':
  Add build.prop to root ramdisk
 2015-01-15 02:27:41 +00:00
Stephen Hines
2306635fa3 Add ld.mc as a required executable to core_minimal.mk. 
Bug: 18322681
Change-Id: I94754641db0c218e044f329bc59d4d918b389533
 2015-01-14 16:11:12 -08:00
Andres Morales
121e53cace am e1f21520: Merge "Add build.prop to root ramdisk" 
* commit 'e1f2152015069b595f9f62f8b74e26baa5ebad9d':
  Add build.prop to root ramdisk
 2015-01-14 16:09:01 +00:00
Andres Morales
e1f2152015 Merge "Add build.prop to root ramdisk" 2015-01-14 15:56:20 +00:00
Andres Morales
9c820f82c4 Add build.prop to root ramdisk 
will be used for verifying installed bootimage

Change-Id: Iaf80823545980fb2e464a558e918715cc1b82e11
 2015-01-13 17:55:09 -08:00
Elliott Hughes
527bf18609 am 32ecc299: am c56a6045: Merge "Remove HAVE_SYMLINKS." 
* commit '32ecc29996d8061ebf5ba2a039368575488132ff':
  Remove HAVE_SYMLINKS.
 2015-01-13 20:33:04 +00:00
Elliott Hughes
d5544cf757 am aa07929b: am 1e61f12f: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER." 
* commit 'aa07929b29f204ad5e96a8a75a63728cdd1e879a':
  Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
 2015-01-13 20:32:32 +00:00
Elliott Hughes
dc176f3fea am 446b9418: am 780c4320: Merge "Remove HAVE_POSIX_CLOCKS." 
* commit '446b9418a4d0b9aa34bf66c99d08c00898b8df4e':
  Remove HAVE_POSIX_CLOCKS.
 2015-01-13 20:30:58 +00:00
Christopher Ferris
d694dbbe09 am b773a8d5: am edbd5fd7: Merge "Fix whole static lib handling of duplicate names." 
* commit 'b773a8d517189a06c54d8ed789806ed42aa42be0':
  Fix whole static lib handling of duplicate names.
 2015-01-13 20:30:44 +00:00
Yohann Roussel
138768c1bb Remove some useless depencies 
... from dexes to jars. This should allow to build less jars when
building dex files with Jack and Jill.

Change-Id: Ib3a717251e3bec3cc73564c205eb908ba1ef380f
 2015-01-13 17:05:36 +01:00
Elliott Hughes
32ecc29996 am c56a6045: Merge "Remove HAVE_SYMLINKS." 
* commit 'c56a60451188da6385ae9f52e0adbef14c647f21':
  Remove HAVE_SYMLINKS.
 2015-01-13 03:25:04 +00:00
Elliott Hughes
c56a604511 Merge "Remove HAVE_SYMLINKS." 2015-01-13 03:11:35 +00:00
Elliott Hughes
5877c21436 Remove HAVE_SYMLINKS. 
Change-Id: I685357292af45a048439f0df0ae45f513479841a
 2015-01-12 17:21:01 -08:00
Miao Wang
9b2908b4f6 Make bcc-compat able to pick the right mtriple flag for Renderscript 
Compat Lib.

Change-Id: Ifb3093ebc392d107e874cee3a67b5f6e942c6e0a
 2015-01-12 17:20:28 -08:00