Commit graph

6 commits

Author SHA1 Message Date
Ying Wang
227cdd02c4 Strip LOCAL_MODULE before referencing it.
Bug: 24985980
Change-Id: Ic97e852aa7a8bf2d9224d3d6656d33145cc67800
(cherry-pick from commit 4d20a32a79)
2015-10-26 17:06:08 -07:00
Yohann Roussel
8998d57404 Allow control of jack used for compilation
Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools

Bug: 24564814

(cherry picked from commit b68c9a498d)

Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
2015-10-21 17:22:05 +02:00
Yohann Roussel
3d263d934b Merge "Check values of LOCAL_JACK_ENABLED" 2015-02-23 20:28:30 +00:00
Yohann Roussel
2794e7b582 Check values of LOCAL_JACK_ENABLED
And throw an error in case of unknown value.

Change-Id: I5cf6276ac433e0b3af51b30b9dad57b689fa0694
2015-02-23 16:02:32 +01:00
Yohann Roussel
b821391614 Allow global overriding LOCAL_JACK_ENABLED
If the variable ANDROID_FORCE_JACK_ENABLED it will override any local
value.

Change-Id: I3fc99b97783dd3a89c3240a8a4269ebf9e477f3f
2015-02-19 12:41:11 +01:00
Yohann Roussel
d2a76c14bf Change built module of static java libraries
Set LOCAL_BUILT_MODULE of static java libraries when Jack is enabled
to classes.jack instead of javalib.jar.
This allows that running mm in those libraries will build classes.jack
instead of the jar.

Change-Id: I96b4b227848e971df96331b3f0cc731e856be349
2015-02-18 22:54:18 +01:00