Commit graph

453 commits

Author SHA1 Message Date
Dan Albert
cce8d98c6b am 9496ef90: am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '9496ef903ff9402859ac82cc339708c15fcd30f6':
  Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:46:49 +00:00
Dan Albert
c0ad316183 am 9496ef90: am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '9496ef903ff9402859ac82cc339708c15fcd30f6':
  Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:46:38 +00:00
Dan Albert
9496ef903f am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit 'c0018b04e984180122ab615d8dbea09a3230ef7f':
  Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:39:25 +00:00
Dan Albert
36b6f0472f Add BUILD(_HOST)?_FUZZ_TEST.
These are tests that use LLVM's libFuzzer for testing with a
sanitizer.

Bug: http://b/22850550
Change-Id: I6eeaff7877b7dd0c30f8910c6f27f5278b27a83d
2015-08-17 14:39:27 -07:00
Dan Willemsen
145ae32069 Remove legacy windows platform build support
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.

Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
2015-08-17 12:35:04 -07:00
Neil Fuller
a0f07b028f am 9354dbac: am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '9354dbac7e06c9e2da288d8f7173e13a7b5c21e8':
  Include the okhttp.jar when compiling against internal classes
2015-08-13 10:58:19 +00:00
Neil Fuller
9354dbac7e am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
  Include the okhttp.jar when compiling against internal classes
2015-08-13 10:51:27 +00:00
Neil Fuller
53d1632681 am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
  Include the okhttp.jar when compiling against internal classes
2015-08-13 10:51:04 +00:00
Neil Fuller
5f19844067 am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
  Include the okhttp.jar when compiling against internal classes
2015-08-13 10:46:46 +00:00
Neil Fuller
bc7680c4d7 Merge "Include the okhttp.jar when compiling against internal classes" 2015-08-13 10:40:39 +00:00
Neil Fuller
f39a25bc28 Include the okhttp.jar when compiling against internal classes
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.

okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.

The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.

This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.

Bug: 23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
2015-08-12 09:30:58 +01:00
Dan Willemsen
ccc933e97b Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
2015-08-12 00:02:20 -07:00
Dan Willemsen
8e29bba8c3 am ec5e3aae: resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp
* commit 'ec5e3aae6d8c89a5f6ca0a34fcdfc72e9a611188':
  Revert "Use repeatable timestamps"
2015-08-12 01:38:06 +00:00
Dan Willemsen
8478f7abbd resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
2015-08-11 18:31:59 -07:00
Dan Willemsen
a635da13b2 am a3b91e62: resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp
* commit 'a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17':
  Use repeatable timestamps
2015-08-12 01:28:03 +00:00
Dan Willemsen
ec5e3aae6d resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp
Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92
2015-08-11 18:27:02 -07:00
Dan Willemsen
33f46daa22 resolved conflicts for merge of c576c08f to mnc-dev-plus-aosp
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
2015-08-11 18:21:43 -07:00
Dan Willemsen
a3b91e621c resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp
Change-Id: I86f6d0e7b9def5afa618915e7249c6758a5f0d1b
2015-08-11 18:11:48 -07:00
Dan Willemsen
b184ec2a82 am 608aa91d: Merge "Revert "Use repeatable timestamps""
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
  Revert "Use repeatable timestamps"
2015-08-12 01:07:44 +00:00
Dan Willemsen
608aa91db7 Merge "Revert "Use repeatable timestamps"" 2015-08-12 01:02:19 +00:00
Dan Willemsen
92026f2d36 Revert "Use repeatable timestamps"
OSX `date` doesn't understand -d

This reverts commit 13ba6e00f4.

Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
2015-08-12 01:00:19 +00:00
Dan Willemsen
c576c08fd5 am 671b8ff5: Merge "Use repeatable timestamps"
* commit '671b8ff5457472631f805f3230273e5e8121b28a':
  Use repeatable timestamps
2015-08-12 00:55:21 +00:00
Dan Willemsen
671b8ff545 Merge "Use repeatable timestamps" 2015-08-12 00:49:26 +00:00
Dan Willemsen
13ba6e00f4 Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
2015-08-11 17:08:03 -07:00
Dan Albert
75c9fb9864 am 070961e6: am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14."
* commit '070961e6f2b462367dea3b3e2ad50259fbcf29fc':
  Bump the default C++ standard up to C++14.
2015-08-10 21:02:12 +00:00
Dan Albert
070961e6f2 am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14."
* commit '96f480c93a318fc6550ef2c4d13e6e67574bfb96':
  Bump the default C++ standard up to C++14.
2015-08-10 20:54:01 +00:00
Dan Albert
92d6efc595 am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14."
* commit '96f480c93a318fc6550ef2c4d13e6e67574bfb96':
  Bump the default C++ standard up to C++14.
2015-08-10 20:53:59 +00:00
Dan Albert
96f480c93a am 4f20869b: Merge "Bump the default C++ standard up to C++14."
* commit '4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
  Bump the default C++ standard up to C++14.
2015-08-10 20:48:48 +00:00
Dan Albert
c7d307d873 Bump the default C++ standard up to C++14.
This also drops the NDK default back to C++98 (or C++11 for code using
libc++). The platform NDK build should match the normal NDK build.

Bug: http://b/23043421
Change-Id: I3a336767ce271e84f4dfdebdadb3a98e5689def9
2015-08-10 13:37:42 -07:00
Christopher Wiley
fe4f4de105 am 422e972b: resolved conflicts for merge of 7d1be400 to mnc-dr-dev-plus-aosp
* commit '422e972b0548a7f3d2b76e6a5ec9dd77c05283cb':
  Add build rules to generate native DBus interfaces
2015-08-05 20:35:50 +00:00
Christopher Wiley
422e972b05 resolved conflicts for merge of 7d1be400 to mnc-dr-dev-plus-aosp
Change-Id: I2c62de9beb50ea1661b114a9d02b11ba73a28d82
2015-08-05 10:20:42 -07:00
Christopher Wiley
a3dbe51f42 resolved conflicts for merge of 7d1be400 to mnc-dev-plus-aosp
Change-Id: Ifc2b669bc573f059f35085d11693ea3d2cac11ec
2015-08-05 10:18:16 -07:00
Christopher Wiley
7d1be40047 am 5923fcd0: Merge "Add build rules to generate native DBus interfaces"
* commit '5923fcd02131abfd1bc8f39704edc6c7e8100154':
  Add build rules to generate native DBus interfaces
2015-08-05 15:46:44 +00:00
Christopher Wiley
bc2be461e4 Add build rules to generate native DBus interfaces
With this patch, we can now write Android makefiles like:

include $(CLEAR_VARS)
LOCAL_MODULE := dbus-binding-example
LOCAL_SRC_FILES := main.cpp \
                   dbus-service-config.json \
                   org.example.Daemon.Command.dbus.xml \
                   org.example.Daemon.Manager.dbus.xml
include $(BUILD_EXECUTABLE)

This will cause header files defining native DBus interfaces
to be generated.  These can be included from main.cpp to
easily expose object oriented interface over DBus.

Bug: 22608897
Change-Id: Ic4304ac8de77de74d6955ed17789e5477be9a53e
2015-07-31 11:14:35 -07:00
Ying Wang
4253434fed am 9ed5072a: am ac6e6b34: am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
* commit '9ed5072a004c89bddfe0a370c4022ae7a30c3469':
  Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-30 00:30:11 +00:00
Ying Wang
9ed5072a00 am ac6e6b34: am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
* commit 'ac6e6b347b49b4c15df1f1b2869f2c386f2755d6':
  Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-30 00:16:16 +00:00
Ying Wang
72a8e48b56 am ac6e6b34: am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
* commit 'ac6e6b347b49b4c15df1f1b2869f2c386f2755d6':
  Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-30 00:15:31 +00:00
Ying Wang
ac6e6b347b am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
* commit '0c0b2e659fe52dc1901677b74dc390c52b1b5e3b':
  Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-29 22:11:39 +00:00
Miao Wang
13276144c2 am c2dd225a: am 473a832d: am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
* commit 'c2dd225a9fdfb85a0de81389c471c074b870907f':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 22:03:10 +00:00
Ying Wang
bb1da5e614 Use unmodified MAKECMDGOALS in ninja.mk.
The build system removes targets like "PRODUCT-full-eng" from
MAKECMDGOALS in build/core/product_config.mk.
Without this change, such target isn't passed to kati.

Change-Id: I0b3949ed1f5557445d7f5d5bd59b7875c0b2ea7f
2015-07-29 12:21:54 -07:00
Miao Wang
c2dd225a9f am 473a832d: am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
* commit '473a832dc4f32239663b3b370fc5847e86f4a208':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 19:13:16 +00:00
Miao Wang
a0abfc6105 am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
* commit '302e944c6034060eb7ff51ea2a3abe740cf2c9b7':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 18:04:08 +00:00
Miao Wang
302e944c60 [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
Bug: 22796994
Bug: 22693954

This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).

Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
2015-07-28 19:30:20 -07:00
Ying Wang
6c4176e2d0 am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '8b4d1432395733db45e2dfaeee24fe44d3c49bbe':
  Cleanups.
2015-07-23 02:06:39 +00:00
Yohann Roussel
23f78643b9 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: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175
2015-07-22 15:22:22 +00:00
Ying Wang
9e612d6d7c am 960424bc: am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '960424bc31ae8072c300681c40bfeb1035e091d1':
  Cleanups.
2015-07-22 00:26:18 +00:00
Ying Wang
960424bc31 am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '8b4d1432395733db45e2dfaeee24fe44d3c49bbe':
  Cleanups.
2015-07-22 00:12:18 +00:00
Ying Wang
8b4d143239 am cd7dfdb4: Merge "Cleanups."
* commit 'cd7dfdb4bf3f7d431d2a37908c550a83a282bf22':
  Cleanups.
2015-07-21 23:57:42 +00:00
Ying Wang
bbd4755647 Cleanups.
- Deleted unused functions in definitions.mk.
- lint is never fully functional in the platform source tree.
- Retire LOCAL_DIST_BUNDLED_BINARIES: now the build system/framework
  supports JNI embedded in apk.

Change-Id: I6314cb20d1544c704ccbc4c1f9cccb9c54fb5a51
2015-07-21 16:03:19 -07:00
Ying Wang
83e8cad45f am 4169f10c: am b22469a8: am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '4169f10c97e5a8ab500e6033d6278c68bd821df5':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:49:35 +00:00
Ying Wang
4169f10c97 am b22469a8: am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit 'b22469a8c50510e141a74932acc3fa17a9dd356c':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:36:46 +00:00
Ying Wang
b22469a8c5 am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '65259743e45886a2941771716b92db91de35ea8c':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:22:53 +00:00
Ying Wang
57d9060ffd Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
  so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.

Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
(cherry-pick from commit c671a7cf5c)
2015-07-21 14:07:50 -07:00
Ying Wang
c7a57e0756 am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit 'c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:01:37 +00:00
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
Ying Wang
c671a7cf5c Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
  so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.

Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
2015-07-20 21:26:53 -07: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
Yohann Roussel
5863a7cf63 Revert "Clean call-jack and its callers"
This reverts commit 5e50b34221.

Change-Id: Ibf76cc454994c7ad84128ac923d39794d46a04ec
2015-07-04 12:11:09 +00:00
Yohann Roussel
5e50b34221 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.

Change-Id: I28b5f7176747853ef707b8d4055017bf60296641
2015-07-03 11:58:38 +02:00
Mohamad Ayyash
af094912eb am 19cfe7db: Merge "Add img2simg in host and ota packages"
* commit '19cfe7db4ce414ce36c973fe90e94afa898194d6':
  Add img2simg in host and ota packages
2015-06-25 18:56:45 +00:00
Mohamad Ayyash
19cfe7db4c Merge "Add img2simg in host and ota packages" 2015-06-25 18:44:03 +00:00
Mohamad Ayyash
abc700a19a am 5ee38170: am 914811a9: Merge "Add img2simg in host and ota packages" into mnc-dev
* commit '5ee381704fbf9ed6482385e559d05d6ee89a8f54':
  Add img2simg in host and ota packages
2015-06-25 00:32:59 +00:00
Mohamad Ayyash
5ee381704f am 914811a9: Merge "Add img2simg in host and ota packages" into mnc-dev
* commit '914811a9f283ed3d8aa826abddf8c11f6167dc14':
  Add img2simg in host and ota packages
2015-06-24 23:42:27 +00:00
Mohamad Ayyash
914811a9f2 Merge "Add img2simg in host and ota packages" into mnc-dev 2015-06-24 23:13:51 +00:00
Mohamad Ayyash
9764892031 Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:08:15 -07:00
Mohamad Ayyash
353265b081 Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 23:01:27 +00:00
Dan Albert
c195d28100 am 8b36f7fc: am 2bb996f6: am 46cb2ee3: Merge "Force some clang Werrors that *will* break things."
* commit '8b36f7fcc7f1745a2dc6f2024c6b1b5fe6212450':
  Force some clang Werrors that *will* break things.
2015-06-13 02:37:28 +00:00
Dan Albert
8b36f7fcc7 am 2bb996f6: am 46cb2ee3: Merge "Force some clang Werrors that *will* break things."
* commit '2bb996f6a58dd4b9e682f9c59a7dad94412bdd86':
  Force some clang Werrors that *will* break things.
2015-06-13 02:25:20 +00:00
Dan Albert
2bb996f6a5 am 46cb2ee3: Merge "Force some clang Werrors that *will* break things."
* commit '46cb2ee3cb120a1c03241e9e2aa66d76c890c486':
  Force some clang Werrors that *will* break things.
2015-06-12 19:59:13 +00:00
C. Sean Young
431150827e am 3c114682: am 6f44670a: am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '3c114682527bb496b73329b01625f7fdba089acf':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 18:17:59 +00:00
C. Sean Young
6f44670ada am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit 'cbaead4cfe737c96c649672b6c1396c35597b5b7':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 17:43:46 +00:00
C. Sean Young
cbaead4cfe am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '540772fa2287e63a0c745229fb72b78903c9cd70':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 16:29:25 +00:00
Dan Albert
d160041149 Force some clang Werrors that *will* break things.
Clang is really aggressive at optimizing a handful of cases (read:
clang will ruin your day some if you write bad code). Fortunately, it
also emits a warning when it's about to do this.

To prevent anyone from suffering from these optimizations, make these
warnings errors and make them impossible to disable.

Change-Id: I5e10bb0fc2ca23190017da716b3b84635577a0bd
2015-06-10 17:24:38 -07:00
C. Sean Young
cf4699895a Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
These directories are excluded in addition to OUT_DIR.
This can be useful if your build system has other output directories
beyond what OUT_DIR is set to.

Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
2015-06-10 13:00:13 -05:00
Ying Wang
9bf1ceded3 Merge "We need to escape environmental variable reference." 2015-05-20 16:23:28 +00:00
Ying Wang
024c24c55c We need to escape environmental variable reference.
Bug: 21260618
Change-Id: I727b400acb0984d1126987df7a04b0d05bc0e705
2015-05-20 09:22:17 -07:00
Ying Wang
b7b99633e9 am 657f497b: am 589e8c52: Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
* commit '657f497b978628221bba2e4418f0f8a22a308bf9':
  Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
2015-05-20 13:15:32 +00:00
Ying Wang
589e8c52fb Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- When raising the ProGuard sdk version for platform build, use
  TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
  dir.

Bug: 20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
2015-05-19 16:03:57 -07:00
Yohann Roussel
f09e59eb52 [DO NOT MERGE] Compile using Jack.
This allows to compile dex targeted java sources using Jack and Jill.
Default is still to compile with the legacy toolchain. Default can be
switched to the new toolchain by setting environement variable:
export ANDROID_COMPILE_WITH_JACK=true
Toolchain can also be forced for one module by defining
LOCAL_JACK_ENABLED:=full # disabled, full, incremental
in the mk portion defining the module.

Jack execution environement can be controlled with:

Global variable ANDROID_JACK_VM allow to change the jvm executing Jack.
Global variable ANDROID_JACK_VM_ARGS allows to change default args given
to the jvm.
Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args
to give to Jack

LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for
the module.
LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack.

This includes cherry-picks of the following changes:
b4c49cba57
22c3fa6d73
138768c1bb
5dd3e1d312
83d5d04047
8bc90fd2d6
140274707e
0fbc9ff2a2
833b427d72
f9a27f45b4
2809666941
37822c443d
c6b44d43c3
d2a76c14bf
06744f60fc
95573d5036
b821391614
2794e7b582
801f2c44d0
c76d99dca1
f528e132d6
76a5e0bd1a
e25b3984ff Partially, only Jack related parts werekept
ec46a3b71f
abee3a9f41
77cbe10fd9
daf07db4cd
b6bfb5893a

Ie all Jack related changes untill
b6bfb5893a
except
a96cc59ab5 "Use Jack by default"

Change-Id: If9d47ef1c4fd1e6765ad2a47d816c1ad3cfab0e3
2015-05-19 18:31:05 +02:00
Yohann Roussel
dd78088ec1 am 46d17af4: am 0a0b640f: Merge "Save Jack default extra args in a file" into mnc-dev
* commit '46d17af4ff8dff6ed30fcfa0963395be1ae9bbb1':
  Save Jack default extra args in a file
2015-05-19 10:02:28 +00:00
Ying Wang
d9d013236a Reset GREP_OPTIONS.
The build system needs unmodified output of grep.

Bug: 21260618
Change-Id: Ifab74e23dfbe23eb12aa053d95d44a5e4a0c97d5
2015-05-18 12:01:24 -07:00
Yohann Roussel
b6bfb5893a Save Jack default extra args in a file
Change-Id: I059b36fc71679eb5c95f05ede26d8037c742921b
2015-05-18 09:44:49 +02:00
Ying Wang
131dd54c19 Merge "Data-binding integration." 2015-05-15 20:14:05 +00:00
Yohann Roussel
daf07db4cd Remove memory args from jill command
Bug: 20688379
Change-Id: I18ef2ab9b476909adf8def47070cb951be6499ae
2015-05-04 17:12:47 +02:00
Ying Wang
ed0361f1d3 Data-binding integration.
- Set up LOCAL_JAVACFLAGS to run annotation processing.
- Set up a new intermediate directory $(data_binding_intermediates) to
  contain data-binding intermediate files.
- The annotation generated code is generated to
  $(data_binding_intermediates)/anno-src. The code will be automatically
  included by javac, so no need to store it in
  $(LOCAL_INTERMEDIATE_SOURCE_DIR).
- Set up rules to run DATA_BINDING_COMPILER. The generated code will be
  put in $(LOCAL_INTERMEDIATE_SOURCE_DIR)/data-binding, so that it can
  be automatically included by $(compile-java); Other generated files
  are put in in subdirs of $(data_binding_intermediates). The generated
  resource dir replaces the app's original LOCAL_RESOURCE_DIR.

Also fixed transform-jar-to-jack on prebuilt aar.

Bug: 19945740
Change-Id: I42d9b0e5cd48cf2dce4488298a960b3c95602beb
2015-04-29 18:24:42 -07:00
Dmitriy Ivanov
be55caf288 am 6f2935dc: am dabf96ab: am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"
* commit '6f2935dc1432a38e149498b6efbd43ed9aceb827':
  Pack relocation tables for dynamic executables
2015-04-23 23:16:36 +00:00
Dmitriy Ivanov
4c2d1a64fb Pack relocation tables for dynamic executables
Add replocation-packer step for dynmic executables.

  Enable it by default for arm and arm64 platforms.

Bug: http://b/18051137
Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
2015-04-23 12:07:16 -07:00
Dimitry Ivanov
bc83d0bb68 am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all dynamic executables""
* commit '893ed24dd7cec9b560fe46862b3635efa327ec65':
  Revert "Pack relocation tables for all dynamic executables"
2015-04-23 05:07:11 +00:00
Dimitry Ivanov
1eca10fa9d Revert "Pack relocation tables for all dynamic executables"
This reverts commit e7a1b8a0c6.

Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
2015-04-23 04:22:33 +00:00
Dmitriy Ivanov
943381b7df am ff084258: am b7b27621: am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic executables"
* commit 'ff084258ea53c414d724ba87f89c324056def1bd':
  Pack relocation tables for all dynamic executables
2015-04-23 03:42:44 +00:00
Dmitriy Ivanov
e7a1b8a0c6 Pack relocation tables for all dynamic executables
Bug: http://b/18051137
Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
2015-04-22 13:30:43 -07:00
Dmitriy Ivanov
594c0868d4 resolved conflicts for merge of 6cb3732d to master
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
2015-04-20 14:08:43 -07:00
Dmitriy Ivanov
4eb120b999 Remove unsupported *_COMPRESS_MODULE_SYMBOLS
Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
2015-04-20 12:24:12 -07:00
Yohann Roussel
77cbe10fd9 Use Jack launcher
Bug: 20132430
Change-Id: I6e30ad3dffbb32824a4c62e562359b084e6a8784
2015-04-15 12:29:01 +02:00
Yohann Roussel
e163b4e2e8 Revert "Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS"
This reverts commit d191667006.

Build server are no longer giving outdated options.

Change-Id: Idece7efc45bb42a39364f721a7e6a576705dc926
2015-04-09 10:10:21 +00:00
Yohann Roussel
d191667006 Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS
This is a temporrary workaround allowing to ignore outdated options
given by the build server that may cause OutOfMemoryError when
running Jack server.

Change-Id: I1b6b956de09faaeee1bf6a25c2a63124b69e2645
2015-04-07 23:43:36 +02:00
Yohann Roussel
abee3a9f41 Don't call Jack directly, use the script instead
Change-Id: Ic9d4aa3cb543ab748423f4ea0d060544a4ea44e6
2015-04-07 23:42:53 +02:00
Rom Lemarchand
93dda7cd8c Add the new audio include path on the list of default includes
Change-Id: If40ba57cb97f86802c2872772672a380afc4d947
2015-04-03 15:09:11 -07:00
David Riley
17be3d3921 Add support to sign boot images with vboot.
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
2015-03-26 17:54:40 +00:00
Yohann Roussel
ec46a3b71f Turn off Jack warnings by default
Change-Id: I24b3135395483b3581d212cb2ab1bb93ba2524d9
2015-03-20 15:40:07 +01:00