am 36cd306f: am dc004a18: am 4a7da607: Merge "Update layoutlib_api-prebuilt.jar to API v10" into jb-mr2-dev
* commit '36cd306f999354ab73f4edae52a5bb6b4ce7e1fb':
Update layoutlib_api-prebuilt.jar to API v10
diff --git a/android-arm/gdbserver/README.txt b/android-arm/gdbserver/README.txt
index f2fc3d2..c75f27f 100644
--- a/android-arm/gdbserver/README.txt
+++ b/android-arm/gdbserver/README.txt
@@ -1,2 +1,9 @@
-To compile a new gdbserver, see
-//toolchain/gdb/src/gdb/gdbserver/README_ANDROID.txt
+Android platform gdb is built by the NDK script now. The source lives in the
+AOSP-toolchain repository.
+
+cd $(AOSP)/ndk
+./build/tools/build-gdbserver.sh --build-out=/tmp/gdbserver-7.6 --gdb-version=7.6 $(AOSP-toolchain)/gdb/gdb-7.6/gdb/gdbserver/ $(NDK) arm-linux-androideabi-4.7
+
+Current prebuilt version is against AOSP-toolchain/gdb/gdb-7.6
+commit 1c4be8e861df1416efe1812dfe0c6e7a096d9d60
+
diff --git a/android-arm/gdbserver/gdbserver b/android-arm/gdbserver/gdbserver
index ae5668d..6cf69a8 100755
--- a/android-arm/gdbserver/gdbserver
+++ b/android-arm/gdbserver/gdbserver
Binary files differ
diff --git a/common/jarjar/Android.mk b/common/jarjar/Android.mk
index 9f0dfa3..fc85f4a 100644
--- a/common/jarjar/Android.mk
+++ b/common/jarjar/Android.mk
@@ -16,6 +16,6 @@
include $(CLEAR_VARS)
-LOCAL_PREBUILT_JAVA_LIBRARIES := jarjar:jarjar-1.0rc8$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_PREBUILT_JAVA_LIBRARIES := jarjar:jarjar-1.4$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/common/jarjar/jarjar-1.0rc8.jar b/common/jarjar/jarjar-1.0rc8.jar
deleted file mode 100644
index 89390bf..0000000
--- a/common/jarjar/jarjar-1.0rc8.jar
+++ /dev/null
Binary files differ
diff --git a/common/jarjar/jarjar-1.4.jar b/common/jarjar/jarjar-1.4.jar
new file mode 100644
index 0000000..68b9db9
--- /dev/null
+++ b/common/jarjar/jarjar-1.4.jar
Binary files differ
diff --git a/darwin-x86/protobuf/MODULE_LICENSE_BSD_LIKE b/darwin-x86/protobuf/MODULE_LICENSE_BSD_LIKE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/darwin-x86/protobuf/MODULE_LICENSE_BSD_LIKE
diff --git a/darwin-x86/protobuf/PREBUILT b/darwin-x86/protobuf/PREBUILT
new file mode 100644
index 0000000..e9fcf94
--- /dev/null
+++ b/darwin-x86/protobuf/PREBUILT
@@ -0,0 +1,2 @@
+The binaries in this prebuilt directory can be rebuilt using
+the source in external/protobuf with build command "make aprotoc".
diff --git a/darwin-x86/protobuf/aprotoc b/darwin-x86/protobuf/aprotoc
new file mode 100755
index 0000000..dd2ed9c
--- /dev/null
+++ b/darwin-x86/protobuf/aprotoc
Binary files differ
diff --git a/linux-x86/protobuf/MODULE_LICENSE_BSD_LIKE b/linux-x86/protobuf/MODULE_LICENSE_BSD_LIKE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/linux-x86/protobuf/MODULE_LICENSE_BSD_LIKE
diff --git a/linux-x86/protobuf/PREBUILT b/linux-x86/protobuf/PREBUILT
new file mode 100644
index 0000000..e9fcf94
--- /dev/null
+++ b/linux-x86/protobuf/PREBUILT
@@ -0,0 +1,2 @@
+The binaries in this prebuilt directory can be rebuilt using
+the source in external/protobuf with build command "make aprotoc".
diff --git a/linux-x86/protobuf/aprotoc b/linux-x86/protobuf/aprotoc
new file mode 100755
index 0000000..3a724e4
--- /dev/null
+++ b/linux-x86/protobuf/aprotoc
Binary files differ
