Skip to content

add 'make package' libadb target to make libadb packages #816

Merged
merged 4 commits into from Aug 30, 2013

2 participants

@mykmelez
Mozilla member

@ochameau, can you take a look at this? It should be straightforward: a make package target for libadb (so we don't have to construct these packages by hand).

@ochameau ochameau was assigned Aug 30, 2013
@ochameau ochameau commented on an outdated diff Aug 30, 2013
android-tools/adb-bin/Makefile
ifeq ($(OS), Windows_NT)
VS_DEVELOPER_CMD_PATH = vcvars32.bat
ADB_TARGETS = winlib
WINDOWS_ARTIFACTS = ../win-out vc110.idb vc110.pdb ../adb-win-api/api/build*_w*_x86.* \
../adb-win-api/api/obj* ../adb-win-api/api/*.idb ../adb-win-api/api/*.pdb \
../adb-win-api/winusb/obj* ../adb-win-api/winusb/build*_w*_x86.*
+ PACKAGE_FILES += \
+ ../win-out/libadb.dll \
+ ../adb-win-api/api/objfre_wxp_x86/i386/AdbWinApi.dll \
+ ../adb-win-api/winusb/objfre_wxp_x86/i386/AdbWinUsbApi.dll
@ochameau
Mozilla member
ochameau added a note Aug 30, 2013

Wouldn't it be better to use obj* instead of objfre_wxp_x86, like what is being done for WINDOWS_ARTIFACTS?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@ochameau
Mozilla member

Ship it!

@mykmelez
Mozilla member

Wouldn't it be better to use obj* instead of objfre_wxp_x86, like what is being done for WINDOWS_ARTIFACTS?

Yes, it would! Fixed in ec74058.

I also fixed a couple other issues:

  • Use the -j flag to zip to trim directory paths from the files being packaged (Windows-specific, as only Windows has multiple source dirs and builds into separate object dirs).
  • Build the same thing (libadb) by default on all three platforms.
@mykmelez
Mozilla member

Ship it!

À votre demande!

@mykmelez mykmelez merged commit 4e36038 into mozilla:master Aug 30, 2013
@mykmelez mykmelez deleted the mykmelez:libadb-package branch Aug 30, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.