Merge lp:~rsalveti/android-audiosystem/enabling-build-i386 into lp:android-audiosystem

[Ricardo Salveti]

Enabling build for i386

Enabling build for i386

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/android-audiosystem-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/android-audiosystem-saucy-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-saucy-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/android-audiosystem-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/android-audiosystem-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/android-audiosystem-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/android-audiosystem-ci/5/rebuild

review: Approve (continuous-integration)

=== modified file 'build-component.sh'
--- build-component.sh	2012-06-06 20:28:40 +0000
+++ build-component.sh	2013-06-05 23:37:27 +0000
@@ -44,9 +44,13 @@
 done
 
 mkdir -p lib/libcutils/.obj/arch-arm
+mkdir -p lib/libcutils/.obj/arch-x86
+
 touch lib/libcutils/.obj/arch-arm/.gitignore
+touch lib/libcutils/.obj/arch-x86/.gitignore
 
 mkdir -p lib/libcutils/.dep/arch-arm
+mkdir -p lib/libcutils/.dep/arch-x86
 
 rm -fr makedirs.$$ dirslist.$$
 

=== modified file 'debian/control'
--- debian/control	2013-04-12 15:07:54 +0000
+++ debian/control	2013-06-05 23:37:27 +0000
@@ -13,7 +13,7 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/android-audiosystem/trunk
 
 Package: libwaudio1
-Architecture: armel armhf
+Architecture: armhf i386
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -23,7 +23,7 @@
 
 Package: libwaudio1-dev
 Section: libdevel
-Architecture: armel armhf
+Architecture: armhf i386
 Multi-Arch: same
 Depends: libwaudio1 (= ${binary:Version}),
          ${misc:Depends},
@@ -33,7 +33,7 @@
  which uses libwaudio.
 
 Package: libandroid-audiosystem-asound2
-Architecture: armel armhf
+Architecture: armhf i386
 Multi-Arch: same
 Depends: pulseaudio,
          ${misc:Depends},

=== modified file 'lib/libcutils/Makefile'
--- lib/libcutils/Makefile	2013-01-21 23:42:55 +0000
+++ lib/libcutils/Makefile	2013-06-05 23:37:27 +0000
@@ -64,7 +64,13 @@
     memory.c
 
 CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32
+
+ifeq ($(ARCH), armhf)
 SFILES += arch-arm/memset32.S atomics_arm.S atomic-android-arm.S
+endif
+ifeq ($(ARCH), i386)
+SFILES += arch-x86/android_memset16.S atomics_x86.S arch-x86/android_memset32.S
+endif
 
 #CCFILES =
 #CPPFILES =

=== modified file 'lib/libcutils/atomics_x86.S'
--- lib/libcutils/atomics_x86.S	2012-05-03 14:32:30 +0000
+++ lib/libcutils/atomics_x86.S	2013-06-05 23:37:27 +0000
@@ -41,6 +41,103 @@
     popl    %ebx
     ret
 
+/* int __atomic_cmpxchg(int old, int new, volatile int* addr) */
+
+.text
+.globl __atomic_cmpxchg
+.type __atomic_cmpxchg, @function
+.align 4
+__atomic_cmpxchg:
+    mov     4(%esp), %eax             /* old */
+    mov     8(%esp), %ecx             /* new */
+    mov     12(%esp), %edx            /* addr */
+    lock cmpxchg %ecx, (%edx)
+    jnz 1f
+    xor    %eax, %eax
+    jmp 2f
+1:
+    movl   $1, %eax
+2:
+    ret                               /* 0 == success, 1 == failure */
+
+
+/* int __atomic_swap(int new, volatile int* addr) */
+
+.text
+.globl __atomic_swap
+.type __atomic_swap, @function
+.align 4
+__atomic_swap:
+    mov     4(%esp), %ecx             /* new */
+    mov     8(%esp), %edx             /* addr */
+    lock xchg %ecx, (%edx)
+    mov     %ecx, %eax
+    ret
+
+
+/*
+ * int __atomic_dec(volatile int* addr)
+ *
+ * My x86 asm is really rusty.. this is probably suboptimal
+ */
+
+.text
+.globl __atomic_dec
+.type __atomic_dec, @function
+.align 4
+__atomic_dec:
+   pushl    %ebx
+   pushl    %esi
+   movl     12(%esp), %ebx             /* addr */
+
+1:
+   movl     (%ebx), %esi               /* old = *addr */
+   movl     %esi, %edx
+   subl     $1, %edx                   /* new = old - 1 */
+
+   pushl    %ebx
+   pushl    %edx
+   pushl    %esi
+   call     __atomic_cmpxchg
+   addl     $12, %esp
+   test     %eax, %eax
+   jnz      1b
+
+   movl     %esi, %eax               /* return old */
+   popl     %esi
+   popl     %ebx
+   ret
+
+
+.text
+/* int __atomic_inc(volatile int* addr) */
+.globl __atomic_inc
+.type __atomic_inc, @function
+.align 4
+__atomic_inc:
+   pushl    %ebx
+   pushl    %esi
+   movl     12(%esp), %ebx             /* addr */
+
+1:
+   movl     (%ebx), %esi               /* old = *addr */
+   movl     %esi, %edx
+   addl     $1, %edx                   /* new = old + 1 */
+
+   pushl    %ebx
+   pushl    %edx
+   pushl    %esi
+   call     __atomic_cmpxchg
+   addl     $12, %esp
+   test     %eax, %eax
+   jnz      1b
+
+   movl     %esi, %eax               /* return old */
+   popl     %esi
+   popl     %ebx
+   ret
+
+
 /* int __futex_syscall3(volatile void *ftx, int op, int count) */
 .text
 .globl __futex_syscall3

=== modified file 'lib/wctlplugin/Makefile'
--- lib/wctlplugin/Makefile	2012-10-18 11:23:57 +0000
+++ lib/wctlplugin/Makefile	2013-06-05 23:37:27 +0000
@@ -53,12 +53,7 @@
 
 MAKESUBDIR = YES
 
-ifeq ($(ARCH), armel)
-LIBSUBDIR = /usr/lib/arm-linux-gnueabi/alsa-lib
-endif
-ifeq ($(ARCH), armhf)
-LIBSUBDIR = /usr/lib/arm-linux-gnueabihf/alsa-lib
-endif
+LIBSUBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib
 
 HDRSUBDIR = /usr/include/alsa
 

=== modified file 'lib/wpcmplugin/Makefile'
--- lib/wpcmplugin/Makefile	2012-10-18 11:23:57 +0000
+++ lib/wpcmplugin/Makefile	2013-06-05 23:37:27 +0000
@@ -55,12 +55,7 @@
 
 MAKESUBDIR = YES
 
-ifeq ($(ARCH), armel)
-LIBSUBDIR = /usr/lib/arm-linux-gnueabi/alsa-lib
-endif
-ifeq ($(ARCH), armhf)
-LIBSUBDIR = /usr/lib/arm-linux-gnueabihf/alsa-lib
-endif
+LIBSUBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib
 
 HDRSUBDIR = /usr/include/alsa
 

=== modified file 'project_make'
--- project_make	2013-01-26 04:28:26 +0000
+++ project_make	2013-06-05 23:37:27 +0000
@@ -3,14 +3,14 @@
 # Macros, targets, etc.
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 #####################
 # Directory hierarchy
 #####################
 
 install_app_rel = usr/bin/
-install_lib_rel = usr/lib/$(DEB_HOST_GNU_TYPE)/
+install_lib_rel = usr/lib/$(DEB_HOST_MULTIARCH)/
 install_hdr_rel = usr/include/
 
 ifeq ($(INSTALL_ROOT),1)