| Age | Commit message (Collapse) | Author |
|---|
|
Disable existing warnings and enable -Werror to prevent
any regressions.
Bug: 31434916
Test: make -j60 iw produces no warnings
Change-Id: Ia7f69acefc1eea55fbeb609e0a48e261f62c8b44
|
|
This isn't producing the correct results anyways, since the working
directory of the script is the top level of the android tree, not
external/iw like the script expects. And moving the working directory
doesn't help either, since we don't have a copy the git tags that it
expects.
I noticed this while testing git submodules as an alternative to repo,
where we suddenly have a .git directory at the top level, and the script
failed.
So just extract the version number itself from the script and write out
our own version.c file.
Test: m out/target/product/generic/gen/EXECUTABLES/iw_intermediates/version.c
Test: Compare version.c before/after
Change-Id: I98ff4e44b84afbcd2ce8319ccf6816d5fa57a90a
|
|
Change-Id: Ifa778f084405647b10166b3cb82d290f44780969
|
|
Silence some (benign) warnings.
Bug: 26105799
Change-Id: I5c8444662e0673f730d2ad196ad25d52d36cbead
|
|
This can be harmful for rules such as "clean" and implicit make rules
defined in iw's Makefile, such as "%.o", etc.
The problem was detected from this build warning:
build/core/main.mk:1045: warning: overriding commands for target `clean'
external/iw/Makefile:126: warning: ignoring old commands for target `clean'
Fix it by removing the include of Makefile in Android.mk.
For now, this creates even more duplication between the two files, in
the future we can try to prevent that by factoring out common code (such
as the list of *.o files, cflags, etc.) into a "common" file that can be
included in both makefiles.
TEST=Build iw from the AOSP tree and confirm it is built correctly.
Confirmed that the warning about the "clean" rule is gone.
Change-Id: Ia927a71edbf0243dc0074a0ac6f6aa583ce636c5
|
|
The binary is also relevant on debug builds.
While at it, removed commented out line marking it as optional.
TEST=Built AOSP tree with this patchset, tested the generated iw binary.
Change-Id: I0bb234c5035235155e9bfb0eb3fd05fb698d4775
Signed-off-by: Filipe Brandenburger <filbranden@google.com>
|
|
The workaround might have been necessary in the past, however now it
produces the following error:
.../libnl.a(attr.o): multiple definition of 'nla_put_flag'
.../android-nl.o: previous definition here
collect2: error: ld returned 1 exit status
TEST=Built AOSP tree with this patchset, tested the generated iw binary.
Change-Id: I932d6d3530f0aaea3dd822d48a74344be35b383a
Signed-off-by: Filipe Brandenburger <filbranden@google.com>
|
|
The latest AOSP refers to that library as libnl and not libnl_2.
TEST=Built AOSP tree with this patchset, tested the generated iw binary.
Change-Id: I79ba4249e3f43bb6d593915458f9a06002d200d2
Signed-off-by: Filipe Brandenburger <filbranden@google.com>
|
|
Don't define "iw" build target in the regular Makefile which gets
included. This confuses the Android build system (coincides with module
name).
Also correct libnl_2 to a be static library, as compiled on Android.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
Unfortunately Android's libnl doesn't have nla_put_flag()
so add a simple source file to declare that for now.
|
