Check-in [01a8bae109]
Overview
Comment:ChromeOS: Made debugging build optional and non-default, as well as applying to the JavaScript portion of the extension
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:01a8bae1090d608d8e7adaa9005b0ade62c28b93
User & Date: rkeene on 2016-02-11 16:02:39
Other Links: manifest | tags
Context
2016-02-11
16:03
ChromeOS: Updated to create a new thread for every request, since we must not run on the main thread check-in: a32e10a9ec user: rkeene tags: trunk
16:02
ChromeOS: Made debugging build optional and non-default, as well as applying to the JavaScript portion of the extension check-in: 01a8bae109 user: rkeene tags: trunk
2016-02-10
23:06
ChromeOS: better cleanup check-in: 82721ca5b6 user: rkeene tags: trunk
Changes

Modified build/chrome/Makefile from [c37ded695f] to [8c559dd520].

     6      6   
     7      7   CACKEY_LIBS = -Llib -lcackey -lz
     8      8   PCSC_LIBS   = -Llib -lpcsc -L${NACL_SDK_ROOT}/lib/pnacl/Release -lppapi -lppapi_cpp
     9      9   LIBS        = $(CACKEY_LIBS) $(PCSC_LIBS)
    10     10   CFLAGS      = -Wall -g3 -ggdb3 -I${NACL_SDK_ROOT}/include -I../../pkcs11 -Iinclude/PCSC
    11     11   CXXFLAGS    = $(CFLAGS) -std=gnu++11
    12     12   LDFLAGS     = -g3 -ggdb3
           13  +
           14  +CACKEY_DEBUG = 0
           15  +ifeq (1,$(CACKEY_DEBUG))
           16  +CACKEY_LIBNAME = libcackey_g
           17  +else
           18  +CACKEY_LIBNAME = libcackey
           19  +endif
    13     20   
    14     21   PATH += :${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
    15     22   export PATH
    16     23   
    17     24   ifeq (,${NACL_SDK_ROOT})
    18     25   $(error "Please set NACL_SDK_ROOT")
    19     26   endif
................................................................................
    36     43   	mv cackey.nmf.new cackey.nmf
    37     44   
    38     45   lib/libcackey.a: build-deps
    39     46   	mkdir -p lib
    40     47   	rm -f lib/libcackey.a
    41     48   	rm -rf workdir-*
    42     49   	+./build-deps
    43         -	cd lib && ln -s ../workdir-*.inst/lib/libcackey_g.a libcackey.a
           50  +	cd lib && ln -s ../workdir-*.inst/lib/$(CACKEY_LIBNAME).a libcackey.a
    44     51   	touch lib/libcackey.a
    45     52   
    46     53   lib/libpcsc.a: lib/libcackey.a
    47     54   	mkdir -p lib
    48     55   	rm -f lib/libpcsc.a
    49     56   	cd lib && ln -s ../workdir-*.inst/lib/libpcsc.a .
    50     57   	touch lib/libpcsc.a
................................................................................
    53     60   	mkdir -p lib
    54     61   	rm -f lib/libz.a
    55     62   	cd lib && ln -s ../workdir-*.inst/lib/libz.a .
    56     63   	touch lib/libz.a
    57     64   
    58     65   google-pcsc.js: lib/libcackey.a
    59     66   	rm -f google-pcsc.js google-pcsc.js.new
    60         -	cat workdir-*.inst/js/{scope,logging,pcsc,pcsc-nacl}.js > google-pcsc.js.new
           67  +	cat workdir-*.inst/js/scope.js > google-pcsc.js.new
           68  +	echo 'GoogleSmartCard.IS_DEBUG_BUILD = $(CACKEY_DEBUG);' >> google-pcsc.js.new
           69  +	cat workdir-*.inst/js/{logging,pcsc,pcsc-nacl}.js >> google-pcsc.js.new
    61     70   	mv google-pcsc.js.new google-pcsc.js
    62     71   
    63     72   include/PCSC/pcsc-nacl.h: lib/libcackey.a
    64     73   	mkdir -p include/PCSC
    65     74   	rm -f include/PCSC/pcsc-nacl.h.new include/PCSC/pcsc-nacl.h
    66     75   	cd include/PCSC && ln -s ../../workdir-*.inst/include/PCSC/pcsc-nacl.h pcsc-nacl.h.new
    67     76   	touch include/PCSC/pcsc-nacl.h.new