aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
AgeCommit message (Collapse)Author
2017-11-15Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9Tobias Thierer
This avoids duplicating the semantics of an unset/empty EXPERIMENTAL_USE_OPENJDK9. Test: make showcommands core-oj (in environments with EXPERIMENTAL_USE_OPENJDK9 set to "", "1.8", and "true"). Bug: 38177295 Change-Id: Ic7b9fdaf8574a1478b4382a399e0f3c4cbc5435a
2017-09-11Move host dependencies to Android.bpColin Cross
Also move dagger2-inject-host to a static dependency, all users of dagger2-host include dagger2-inject-host statically, and depending on as non-static library causes it to be installed unnecessarily. See build/soong/README.md for more information. The libraries in lib/ are used outside the project by host tools that are prerequisites for converting device modules to soong. Test: m -j checkbuild Change-Id: I3f8164c3a67b37f88fca888cabac290d2c927d1e
2017-07-17Update auto-value to version 1.4.1.android-o-preview-4android-o-iot-preview-5o-iot-preview-5Tobias Thierer
I built these jars locally from the "auto" subdirecories of the sources from [1], using maven 3. Based on the version name, those should exactly equal the sources browsable at [2], but this was not independently verified. The commands used to build the .jars were: - For auto-value-1.4.1-sources.jar: mvn source:jar - For auto-value-1.4.1.jar: mvn install auto-value-1.4.1.jar.txt is a copy of [3]. Bug: 63748235 Test: Treehugger [1] https://github.com/google/auto/archive/auto-value-1.4.1.zip [2] https://github.com/google/auto/tree/auto-value-1.4.1 [3] https://github.com/google/auto/blob/auto-value-1.4.1/LICENSE.txt Change-Id: I3d85cbc9257c283873c2b424860169ebe4f16cea
2017-05-24Fix annotation processors working w/ generated code on OpenJDK 9 toolchainandroid-o-preview-3Tobias Thierer
Generated code is annotated with @javax.annotation.Generated. Annotation processors working with such code break on OpenJDK 9 toolchains because that class lives in the module "java.xml.ws.annotation". This CL makes that module available by adding the javac command line flag -J--add-modules=java.xml.ws.annotation to javac When the environment variable EXPERIMENTAL_USE_OPENJDK9 is set to true. Test: make ANDROID_COMPILE_WITH_JACK=false checkbuild tests \ && make checkbuild tests (with OpenJDK 8u45 toolchain on the PATH) Test: make EXPERIMENTAL_USE_OPENJDK9=true \ ANDROID_COMPILE_WITH_JACK=false checkbuild (with jdk 9-ea+170 toolchain on the PATH) Bug: 62050818 Change-Id: Ib3e19621a0e24f79807be0dd239e9abec3350383
2017-04-07Replace custom annotation processor handlingandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Colin Cross
Use LOCAL_ANNOTATION_PROCESSORS instead of custom annotation processor handling. Test: m -j java Change-Id: Ia01cc51ea8dbe0842145789ef22a278573c1ee6b
2016-02-23Pin libraries needed by vogar tool to java 1.7android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releaseNeil Fuller
vogar still uses javac/dx by default. dx does not handle v52 class files. The default java version is going to switch to 1.8. This change pins the targets need by vogar to 1.7. Bug: 26753820 Bug: 27310428 Change-Id: I0f18bc98d3500828a09dbe5a4766940ee993b9fe
2015-12-07Removed unnecessary disabling of JackPaul Duffin
The annotation processor only works on host at the moment and as Jack is not used for the host build disabling jack, using LOCAL_JAVA_ENABLED := disabled is unnecessary so any references to it will be removed. Change-Id: I950ae221173dfe6fa6ae98d73cda6b98dcf07943
2015-11-26Update dagger2 and improve build filePaul Duffin
Updates daggers2 to a later version, reverts change that adds a dependency on Guava v19 as AOSP currently only has v18. See README.android for more details. Made a couple of changes to the build to make it reusable. 1) Added dagger2_annotation_processor.mk to define values that are needed by modules that depend on dagger2. 2) Added java_annotation_processor.mk to do the magic needed to make the annotation processors work properly. Change-Id: Ie0e8b0e34c961f64ccd0a45bd93a7ea6a216ddf3
2015-11-24Use a -processor option per processor classPaul Duffin
The code indexing tool does not parse the value of the -processor option as a comma separated list so use one class per option. Change-Id: I3fc1f953ca39fe1e5b00af6e7cc88cc38caa80f5
2015-11-24Work around limitation in code indexing toolPaul Duffin
A code indexing tool does not support the default discovery of annotation processors or using the -classpath as the default class path to search for annotation processor classes so they both have to be specified explicitly using -processor and -processorpath respectively. At the moment this hard codes the path to an intermediate file, this should be a temporary measure either until a better way of building the -processorpath is found, -processorpath defaults to -classpath, or until default discovery works properly. Change-Id: I6224041972d1ef8d60fd153263bb0a1468114d03
2015-11-23Added initial version of dagger2 from upstreamPaul Duffin
Bug: 24848946 Change-Id: I1b359bbbf8b07de1f84f3b7dfd263a58f0fd439b