Commit Graph

697 Commits

Author SHA1 Message Date
Joel Dice
ca4f2224d9 Merge pull request #217 from bigfatbrowncat/avian-pack
Some improvements for Android lib core support
2014-04-07 14:51:12 -06:00
Vasily Litvinov
11959d8ab3 Reversed applying patches to android libcore 2014-04-07 23:12:13 +04:00
Vasily Litvinov
f70ec251ce Fixing indentation 2014-04-05 01:19:52 +04:00
Vasily Litvinov
e55007297b Slight reformatting 2014-04-05 01:17:21 +04:00
Vasily Litvinov
84a102247d Fixing dos2unix call before patching (breaks on MacOS) 2014-04-05 01:16:10 +04:00
Ilya Mizus
a69c4be102 Merge commit '61b1c9380551d14f48ed2158b310e67a79001a60' into avian-pack 2014-04-04 20:21:30 +04:00
Ilya Mizus
66edf1ff4a Fix for https://github.com/ReadyTalk/avian/issues/216 2014-04-04 20:21:16 +04:00
Vasily Litvinov
61b1c93805 Added patching of Android sources by a patchfile, now used to comment call to System.loadLibrary("conscrypt_jni") 2014-04-03 04:11:06 +04:00
Joel Dice
548cce5af0 use x86_64-w64-mingw32- prefix for tools like dlltool as necessary
This fixes architecture mismatches when cross-compiling.
2014-04-02 08:56:12 -06:00
Vasily Litvinov
b52cbc21b2 Fixed .properties publishing and patching 2014-03-30 23:41:26 +04:00
Vasily Litvinov
25a8a1d59a Merge branch 'avian-droid-2' of https://github.com/bigfatbrowncat/avian into avian-droid-2
Conflicts:
	makefile
Resolved using my changes
2014-03-30 23:16:01 +04:00
Vasily Litvinov
c4e194b63f Small refactoring of the non-class file copying 2014-03-30 23:10:48 +04:00
Joel Dice
043e832c02 fix OpenJDK and Android build regression
c2bfba9 introduced a regression such that building against a non-Avian
class library failed due to avian.Cell not being added to the library.
Since avian.Continuations depends on that class, the build broke.
2014-03-25 15:58:46 -06:00
Joel Dice
164717056b remove makefile references to deleted classes 2014-03-24 10:10:08 -06:00
Joel Dice
570b5447bf fix openjdk and android builds when continuations=true
Also, update the whitespace padding for printing test results to
accommodate long names like extra.ComposableContinuations.
2014-03-21 07:38:29 -06:00
Joel Dice
91e4d2b4a1 quick sketch of composable continuation implementation
I've been told by knowledgeable people that it is impossible to
implement composable continuations (AKA delimited continuations AKA
shift/reset) in terms of call-with-current-continuation.  Since I
don't yet understand why that is, I figured it would help my
understanding to attempt it and see how it fails.
2014-03-21 07:38:28 -06:00
Ilya Mizus
ffc439ad23 Merge branch 'master' of https://github.com/ReadyTalk/avian into avian-droid-2 2014-03-19 00:17:22 +04:00
Vasily Litvinov
a311ced69e Added patching of security.properties - removed "com.android." in front of all "com.android.org.*" classes 2014-03-18 23:13:35 +04:00
Vasily Litvinov
df06564392 Made it so all non-.java files from luni/src/main will be added to classpath directory 2014-03-18 19:22:52 +04:00
Vasily Litvinov
3bd903ca69 Now making it so all .properties get packed into classpath.jar 2014-03-18 19:01:44 +04:00
Joshua Warner
a368dc0625 remove unused 'audit-codegen' tool 2014-03-16 19:42:03 -06:00
Vasily Litvinov
1f8fa8a4e8 Made .properties be copied from Android Java source tree 2014-03-17 00:15:33 +04:00
Ilya Mizus
abc9316702 NativeCrypto added for Windows 2014-03-15 21:21:24 +03:00
Joel Dice
70b5ea6838 Merge pull request #191 from bigfatbrowncat/avian-droid
Android classpath support in Windows
2014-03-12 16:38:37 -06:00
Vasily Litvinov
e3ddb14fd2 Merge branch 'avian-droid' of https://github.com/bigfatbrowncat/avian into avian-droid 2014-03-12 01:11:41 +04:00
Vasily Litvinov
5403a43edf Enabling org_conscrypt_NativeCrypto.cpp build 2014-03-12 01:11:33 +04:00
Ilya Mizus
7cac232bd4 Tools fixed 2014-03-06 18:35:20 +04:00
Ilya Mizus
57f50ca7ea Some small cleanup before pull request 2014-03-06 18:33:23 +04:00
Vasily Litvinov
24ba96192c Merge branch 'avian-droid' of https://github.com/bigfatbrowncat/avian into avian-droid 2014-03-05 03:03:07 +04:00
Vasily Litvinov
0982debca7 Got rid of __DISABLE_IPV6_PROTO macro 2014-03-05 03:02:48 +04:00
Ilya Mizus
33a48afd17 NativeCrypto is back for non-Windows platforms 2014-03-05 01:33:41 +04:00
Vasily Litvinov
6ae149809f Enabled "FIXME_STUB" macro 2014-03-04 00:41:58 +04:00
Joel Dice
1cd822b23e Merge pull request #180 from joshuawarner32/move-allocator
Move allocator & Slice into util
2014-02-27 08:55:24 -07:00
Joel Dice
0c298eb513 move OpenJDK.getProtectionDomain into Classes.java
This way, apps can access the CodeSource of a class whether they're
using the OpenJDK class library or the Avian one.
2014-02-26 14:09:42 -07:00
Vasily Litvinov
63a691f41d Adding a define to tell Android Classpath to disable IPv6, removing -fPIC on Windows as it's useless there and generates warnings 2014-02-26 19:41:55 +04:00
Joshua Warner
b083f3df04 move fixed allocator out of machine.h 2014-02-25 20:34:03 -07:00
Vasily Litvinov
e217a4faf8 Removing workaround for Enum.java, fixing the root cause of the issue 2014-02-26 03:35:05 +04:00
Vasily Litvinov
a2ff617f1e Adding a workaround for read-only Enum.java during build 2014-02-26 03:24:10 +04:00
Ilya Mizus
2eaeaa2b12 Merge remote-tracking branch 'refs/remotes/ReadyTalk/master' into avian-droid 2014-02-26 01:27:32 +03:00
Joshua Warner
3bd00f19bc fix remote-test functionality for windows 2014-02-22 15:35:12 -07:00
Joshua Warner
730dade53e break out signal handling from System 2014-02-21 23:36:40 -07:00
Joshua Warner
5ffdfecdc2 remove vm from code paths, to match namespacing 2014-02-21 13:32:28 -07:00
Ilya Mizus
66f25193df OsConstants removed from blacklist 2014-02-21 23:14:07 +03:00
Ilya Mizus
ff4c07f05b Changes to build on my libcore version 2014-02-21 03:50:06 +03:00
Joel Dice
2b1177039e use armv7 memory barriers by default
armv7 and later provide weaker cache coherency models than armv6 and
earlier, so we cannot just implement memory barriers as no-ops.  This
patch uses the DMB instruction (or the equivalent OS-provided barrier
function) to implement barriers.  This should fix concurrency issues
on newer chips such as the Apple A6 and A7.

If you still need to support ARMv6 devices, you should pass
"armv6=true" to make when building Avian.  Ideally, the VM would
detect what kind of CPU it was executing on at runtime and direct the
JIT compiler accordingly, but I don't know how to do that on ARM.
Patches are welcome, though!
2014-01-10 17:32:54 -07:00
Joel Dice
65f6431de0 use ';' instead of ':' as path separator on windows when running tests 2014-01-08 16:08:15 -07:00
Joel Dice
be549ecae3 Merge pull request #142 from joshuawarner32/compiler-boilerplate
Remove boilerplate in Compiler interface
2013-12-20 13:33:30 -08:00
Joshua Warner
fa65c67fbf Extract independent runtime thunks into their own file 2013-12-18 22:46:58 -07:00
Joel Dice
8bd1c8de0e only enable LTO if use-lto is true
When using clang, as with GCC, we shouldn't use LTO if the developer
has specified use-lto=false.
2013-12-18 15:26:43 -07:00
Joel Dice
38477c113c fix iOS 7 build using latest Xcode
It looks like the iOS 7 SDK doesn't have GCC anymore, so we need to
use clang instead.  Also, thread_act.h and thread_status.h have moved,
so I updated arm.h accordingly.  That might break the build for older
SDKs, but I don't have one available at the moment.  If it does break,
I'll fix it.
2013-12-18 11:10:04 -07:00
Joshua Warner
d2c3d771d7 fix java 1.6 compatibility, and make sure it's maintained in the future 2013-12-10 20:26:29 -07:00
Joshua Warner
94f5888f97 prevent openjdk-src build from trying to load the installed 'JavaRuntimeSupport' (fixes #128) 2013-12-07 18:49:23 -07:00
Joshua Warner
773417ab2b fix openjdk-src build failures on osx 10.9 2013-12-07 16:43:18 -07:00
Joshua Warner
0a4eff33b2 fix jdk-test failures 2013-12-06 19:30:04 -07:00
Joshua Warner
47a7732a81 add jdk-test target, and fix failures
The intent of this target is to run our test suite against the installed jre.
This should help prevent our VM from diverging in implementation from the jdk.

The remainder of this commit fixes the problems that this exposes.
2013-12-06 15:00:02 -07:00
Mike Jensen
a2e1e1eec9 Merge pull request #102 from dscho/proxy-annotations
This looks good to me, good work.
2013-12-02 09:13:01 -08:00
Johannes Schindelin
1960081d1a Compile the annotation tests with the annotations in the class path
Earlier, if the annotations were already up-to-date (but
Annotations.class not), the compilation would fail.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2013-11-26 15:27:07 -06:00
Ben Limmer
39214d860f Automatically generate and commit Javadoc.
This will only generate on pushes to master, and not pull requests.
2013-11-20 17:02:33 -07:00
Joshua Warner
80d49dada7 Merge pull request #101 from getlantern/lantern
Fixed problem picking up policy jars in OpenJDK embedded build
2013-11-11 08:34:46 -08:00
Ox To A Cart
cfe041c7ac Fixed problem picking up policy jars in OpenJDK embedded build 2013-11-08 09:11:46 -06:00
Joshua Warner
a54be0a381 fix openjdk build (add InnerClassReference to classpath-sources) 2013-11-07 18:52:11 -07:00
Joshua Warner
790fcff73e Merge pull request #89 from dscho/get-resources
Support ClassLoader#getResources with multiple class path elements
2013-11-04 16:29:40 -08:00
Joshua Warner
9080b462b6 fix jni_md.h not found 10.9 problem 2013-11-04 17:26:57 -07:00
Johannes Schindelin
a2feec0bab Add a pseudo-integration test for getResources()
This adds an extra class path element to the VM running the unit tests,
writes files with identical file names into both directories and then
verifies that SystemClassLoader#getResources can find them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2013-11-04 16:53:02 -06:00
Geoff Nixon
69ea1f5721 Bugfixes for Mac OS X, etc. 2013-10-31 01:35:56 -07:00
Joshua Warner
699ca75c54 fix sdk detection logic 2013-09-03 21:03:29 -06:00
Joel Dice
c06dd28ea0 fix Android classpath build for iOS
This mainly involved reworking the makefile to avoid conflating
Darwin/ARM builds with iOS, since we may also want to build for the
iOS Simulator, which is i386.

Note that I was only able to test this on the Simulator, since I don't
have a real iOS device to test with.  Sorry if I broke something; if
so, please fix it :)
2013-07-31 15:20:32 -07:00
Joel Dice
3058e4254d only use librt on Linux; OS X doesn't have or need it 2013-07-07 11:35:20 -06:00
Joel Dice
82577d742f fix Android classpath build
Hopefully it will stay fixed this time, since we now specify commit
hashes for each dependency which are known to work.
2013-07-05 14:36:16 -06:00
Joel Dice
c5d2cb007c tweaks to prepare for 0.7 release 2013-07-02 14:39:20 -06:00
Joshua Warner
de21913d13 fix linux->darwin cross-compile
There were two issues: the linux->darwin cross compiler is more stringent
about unused variables, and the makefile specified flags for building ON
darwin that were actually applicable whenever we are building FOR darwin.
2013-06-04 13:32:22 -06:00
Joel Dice
64002319c5 use Android directory layout when accessing class library code
Per https://github.com/ReadyTalk/avian/issues/53, Avian should build
against a standard AOSP checkout, which means we should look for
subprojects in the directories the repo utility would place them.
2013-04-22 17:10:23 -06:00
Carsten Elton Sorensen
43f41f6e73 Fixed embed.exe loader 2013-04-03 11:46:17 +02:00
Joel Dice
e8a1900c2b fix openjdk-src build regression 2013-03-26 08:30:26 -06:00
Joel Dice
1630739849 fix Windows x86_64 build regression due to unspecified AVIAN_TARGET_FORMAT 2013-03-15 17:47:15 -06:00
Joel Dice
651145bd61 remove -static-libstdc++ -static-libgcc from bootimage-generator-lflags
MinGW-w64's GCC doesn't understand those flags, and we shouldn't be
linking statically or dynamically with either of those libraries.
2013-03-15 13:57:44 -06:00
Joel Dice
9f2e0f6c4f rebuild bootimage-generator when vm-objects have changed 2013-03-15 13:16:20 -06:00
Joel Dice
8ac1f68a79 fix Android library build regression for non-Windows platforms 2013-03-15 13:15:48 -06:00
Joel Dice
d5504d8f58 first step towards supporting Android class library on Windows
A majority of the tests are passing, but more work is needed to get
them all to pass.
2013-03-14 15:33:05 -06:00
Joel Dice
ff19ab6c13 add avian.trace.port property
Setting this property (e.g. -Davian.trace.port=5555) will cause the VM
to start an extra daemon thread which listens on the specified TCP
port for incoming connections and dumps stack traces for all running
threads to that socket.  You can retrieve that dump using e.g. netcat:

  nc localhost 5555
2013-03-08 14:47:27 -07:00
Joel Dice
caa632d601 fix build when let expressions aren't available 2013-03-04 14:42:18 -07:00
Joel Dice
5d730fe8fa various tweaks to get hello-ios working with the Android library 2013-03-04 14:24:41 -07:00
Joel Dice
b3978c0a0a fix msvc build 2013-03-04 11:09:59 -07:00
Joshua Warner
06bc978d33 Merge branch 'wip' 2013-03-01 15:44:02 -07:00
Joshua Warner
df23c379bf fix windows embed-loader build 2013-03-01 14:52:27 -07:00
Joel Dice
625c04e786 a few tweaks to fix the OS X Android class library build
With corresponding changes to libcore, all the tests are passing
except Datagrams, which fails with a NPE in
NetworkInterface.getNetworkInterfacesList due to OS X not having
/sys/class/net.  Porting that class to OS X looks like a non-trivial
task.
2013-02-28 10:15:10 -07:00
Joshua Warner
9327043bc5 Merge branch 'master' into wip
Conflicts:
	makefile
	src/codegen/arm/assembler.cpp
	src/codegen/powerpc/assembler.cpp
	src/codegen/x86/assembler.cpp
2013-02-27 19:27:07 -07:00
Joel Dice
c261e1c283 fix OpenJDK tests on OS X 2013-02-27 12:05:57 -07:00
Joel Dice
726cdb645b support iOS SDK 6.1 2013-02-27 12:05:57 -07:00
Joel Dice
22ecf27aa5 use -I$(src) instead of -idirafter $(src)
This fixes the iOS build, where the wrong version of util.h was being
used.  The change to use -idirafter happened way back in 2007, and I
can't remember what its intention was.  We'll have to watch for
regressions on other platforms.
2013-02-27 12:05:57 -07:00
Joel Dice
3eda6ab0a2 Merge remote-tracking branch 'github/master' into dicej
Conflicts:
	makefile
2013-02-27 10:09:38 -07:00
Joel Dice
d4a42c7a26 add Android class library instructions to README.md 2013-02-27 10:03:17 -07:00
Joel Dice
e6a46fc014 various fixes to get avian-swt-examples working with the Android class library 2013-02-26 16:24:02 -07:00
Joel Dice
8a976fafa7 fix avian-unittest openjdk-src build 2013-02-25 16:55:44 -07:00
Joel Dice
0bb0b1ec0e enable use of Android class library on 64-bit systems
This involved patching libcore.git to make it 64-bit safe.
2013-02-25 16:41:46 -07:00
Joshua Warner
56625b89d8 group x86, arm, and powerpc target directories into 'target' 2013-02-23 22:47:52 -07:00
Joel Dice
686c2352c1 all tests now pass for Android class library build 2013-02-22 17:23:59 -07:00
Joel Dice
0a4a04cc09 Merge remote-tracking branch 'github/master' into dicej 2013-02-22 17:13:10 -07:00
Joshua Warner
dbbd4e7d40 attempt fix for openjdk tests 2013-02-22 15:13:25 -07:00
Joel Dice
9060a31348 Merge remote-tracking branch 'github/master' into dicej
Conflicts:
	src/classpath-openjdk.cpp
2013-02-22 14:43:20 -07:00