Fred Gylys-Colwell 717837ff00 Update Protobuf Directory in Makefile (DO NOT MERGE) ...

This update to Android.mk allows the protobuffers to be compiled and
the code to see them in the correct directories.

This change is manualy merged from master, so should not be merged back.

bug 15987446

Change-Id: I8676567c33a6ebb87a2904bff9f3aa9ce093664b

2014-07-30 13:01:16 -07:00

..

cdm

Add Support for Audio MIME Types

2014-04-02 15:39:12 -07:00

docs

Support CAST V2 authentication - OEMCrypto Interface - DO NOT MERGE

2014-03-24 13:46:38 -07:00

include

Add Support for Audio MIME Types

2014-04-02 15:39:12 -07:00

level3

Support CAST V2 authentication - OEMCrypto Interface - DO NOT MERGE

2014-03-24 13:46:38 -07:00

mediacrypto

Updated gMock to 1.7.0

2014-03-10 11:37:24 -07:00

mediadrm

Add Support for Audio MIME Types

2014-04-02 15:39:12 -07:00

oemcrypto

Remove Test Keybox - DO NOT MERGE

2014-03-31 15:35:12 -07:00

src

Add Support for Audio MIME Types

2014-04-02 15:39:12 -07:00

test

am d3e06ad1: am eafc65e7: resolved conflicts for merge of 65a35c7d to klp-dev

2014-04-05 00:36:55 +00:00

third_party/stringencoders

Migration from jb-mr2 to master for Widevine CDM

2013-07-29 17:29:07 -07:00

Android.mk

Update Protobuf Directory in Makefile (DO NOT MERGE)

2014-07-30 13:01:16 -07:00

build_and_run_all_unit_tests.sh

Improve unit test build script

2013-12-12 10:58:42 -08:00

run_all_unit_tests.sh

Improve unit test build script

2013-12-12 10:58:42 -08:00